Merge pull request #2 from jenkinsci/generic-flow-analyzer

Generified Flow Search Algorithms
jenkinsci · Aug 25, 2016 · 1d7b255 · 1d7b255
2 parents 5a35dd0 + 3d3bf57
commit 1d7b255
Show file tree

Hide file tree

Showing 28 changed files with 3,325 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,28 @@
 target
 work
-.idea
+
+# IntelliJ project files 
 *.iml
+*.iws
+*.ipr
+.idea
+out
+
+# eclipse project file
+.settings
+.classpath
+.project
+build
+
+# vim
+*~
+*.swp
+
+# ctags
+tags
+
+# OS X
+.DS_Store
+
+# mvn versions:set
+pom.xml.versionsBackup
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
         <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
       <tag>HEAD</tag>
-  </scm>
+    </scm>
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>
@@ -70,5 +70,23 @@
             <artifactId>workflow-step-api</artifactId>
             <version>1.15</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-job</artifactId>
+            <version>1.15</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-cps</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-basic-steps</artifactId>
+            <version>1.15</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/graph/FlowNode.java b/src/main/java/org/jenkinsci/plugins/workflow/graph/FlowNode.java
@@ -114,13 +114,15 @@ public final boolean isRunning() {
     /**
      * Returns a read-only view of parents.
      */
+    @Nonnull
     public List<FlowNode> getParents() {
         if (parents == null) {
             parents = loadParents(parentIds);
         }
         return parents;
     }
 
+    @Nonnull
     private List<FlowNode> loadParents(List<String> parentIds) {
         List<FlowNode> _parents = new ArrayList<FlowNode>(parentIds.size());
         for (String parentId : parentIds) {
@@ -135,6 +137,7 @@ private List<FlowNode> loadParents(List<String> parentIds) {
 
     @Restricted(DoNotUse.class)
     @Exported(name="parents")
+    @Nonnull
     public List<String> getParentIds() {
         List<String> ids = new ArrayList<String>(2);
         for (FlowNode parent : getParents()) {