re

Author: codingforkind

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

@@ -219,11 +219,15 @@ private ASTNode searchDirectParentControlNode(ASTNode astNode) {
             // locate the direct parent control type node's position
             parent = parent.getParent();
         }
+        if (null == parent) {
+            return null;
+        }
 
         // mark the s between astNode and statements and return
         int currentLine = AstUtils.getSpecificStartLine(astNode);
         int directParentStartLine = AstUtils.getSpecificStartLine(parent);
         markCtrlEdge(currentLine, astNode, directParentStartLine, parent);
+
         return parent;
     }
 

mirror-common/src/main/java/cn/com/mirror/reflect/EdgeConstructor.java

@@ -16,6 +16,7 @@
 import cn.com.mirror.repository.neo4j.node.MethodNode;
 import cn.com.mirror.repository.neo4j.node.StatementNode;
 import cn.com.mirror.repository.neo4j.storage.GraphEngine;
+import cn.com.mirror.utils.FileUtils;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -60,10 +61,6 @@ public void construct() {
                 Base tailB = getBaseElement(ctrlVal);
 
                 if (null == headB || null == tailB) {
-                    // TODO xyz the statement of "return this;" and "return null" can not be visited,
-                    // directly result in that head statement can not be retrieve from the base elements.
-                    // do some spacial treatment for "return this;" and "return null".
-
                     log.debug("TARGET: {}", targetPath);
                     log.debug("HEAD: {}:{} \t->\t TAIL: {}:{}", ctrlKey.getLineNum(),
                             ctrlKey.getVertexType(), ctrlVal.getLineNum(), ctrlVal.getVertexType());
@@ -141,7 +138,22 @@ private Base getBaseElement(Vertex vertex) {
 
             case FIELD:
             case STATEMENT: {
-                return unit.getStatements().get(vertex.getTargetPath()).get(vertex.getLineNum());
+                Statement statement = unit.getStatements().get(vertex.getTargetPath()).get(vertex.getLineNum());
+                if (null != statement) {
+                    return statement;
+                }
+
+                log.warn("Statement: " + vertex.getLineNum()
+                        + "-" + vertex.getVertexType()
+                        + " for target: {" + vertex.getTargetPath() + "}"
+                        + " is not retrieved from the variable visitor.");
+
+                statement = new Statement(vertex.getTargetPath(),
+                        vertex.getLineNum(),
+                        vertex.getLineNum(),
+                        FileUtils.listCodeLines(vertex.getTargetPath()).get(vertex.getLineNum() - 1),
+                        unit.getPackages().get(vertex.getTargetPath()));
+                return statement;
             }
 
             default:

mirror-common/src/main/java/cn/com/mirror/utils/AstUtils.java

@@ -9,15 +9,12 @@
 public class AstUtils {
 
     public static int getStartLine(ASTNode node) {
-        if (null == node) return -1;
-
 //        Using the first two character to calculate the line number
         return ((CompilationUnit) node.getRoot()).getLineNumber(node.getStartPosition() + 1);
     }
 
 
     public static int getEndLine(ASTNode node) {
-        if (null == node) return -1;
         return ((CompilationUnit) node.getRoot()).getLineNumber(
                 node.getStartPosition() + node.getLength() - 1);
     }
@@ -38,6 +35,7 @@ public static final CompilationUnit getCompUnitResolveBinding(String javaFile) {
 
     /**
      * Get specific statement (or TypeDeclaration, MethodDeclaration) start line number
+     *
      * @param astNode Statement, TypeDeclaration, MethodDeclaration
      */
     public static final int getSpecificStartLine(ASTNode astNode) {
@@ -61,6 +59,11 @@ public static final int getSpecificStartLine(ASTNode astNode) {
 
         if (astNode instanceof SwitchCase) {
             SwitchCase switchCase = (SwitchCase) astNode;
+            // the expression of default case is null
+            if (null == switchCase.getExpression()) {
+                return getStartLine(switchCase);
+            }
+
             return getStartLine(switchCase.getExpression());
         }
 

mirror-common/src/test/cn/com/mirror/pair/PairAnalyserTests.java

@@ -17,7 +17,7 @@
 public class PairAnalyserTests {
 
     private static final String TEST_FILE =
-            "/home/piggy/work/mirror/mirror-common/src/main/java/cn/com/mirror/project/unit/element/Method.java";
+            "/home/piggy/work/mirror/mirror-common/src/main/java/cn/com/mirror/analyser/visitor/VariableVisitor.java";
 
     @Test
     public void testDirectCtrlEdge() {