MESH-613 : Multilevel Product Lineage

intg/src/main/java/org/apache/atlas/model/lineage/LineageListRequest.java

@@ -27,6 +27,9 @@ public class LineageListRequest {
     private Boolean                         excludeClassifications;
     private Boolean                         immediateNeighbours=false;
 
+    public static final String LINEAGE_TYPE_PRODUCT_ASSET_LINEAGE = "ProductAssetLineage";
+    public static final String LINEAGE_TYPE_DATASET_PROCESS_LINEAGE = "DatasetProcessLineage";
+
     public Boolean getImmediateNeighbours() {
         return immediateNeighbours;
     }
@@ -35,6 +38,8 @@ public void setImmediateNeighbours(Boolean immediateNeighbours) {
         this.immediateNeighbours = immediateNeighbours;
     }
 
+    private String lineageType = LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
+
     public enum LineageDirection {INPUT, OUTPUT}
 
     public LineageListRequest() {
@@ -91,6 +96,14 @@ public void setDepth(Integer depth) {
         this.depth = depth;
     }
 
+    public String getLineageType() {
+        return lineageType;
+    }
+
+    public void setLineageType(String lineageType) {
+        this.lineageType = lineageType;
+    }
+
     public LineageDirection getDirection() {
         return direction;
     }

intg/src/main/java/org/apache/atlas/model/lineage/LineageOnDemandRequest.java

@@ -11,6 +11,8 @@
 
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.PUBLIC_ONLY;
+import static org.apache.atlas.model.lineage.LineageListRequest.LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
+import static org.apache.atlas.model.lineage.LineageListRequest.LINEAGE_TYPE_PRODUCT_ASSET_LINEAGE;
 
 @JsonAutoDetect(getterVisibility = PUBLIC_ONLY, setterVisibility = PUBLIC_ONLY, fieldVisibility = NONE)
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@@ -22,6 +24,7 @@ public class LineageOnDemandRequest {
     private Set<String>                             attributes;
     private Set<String>                             relationAttributes;
     private LineageOnDemandBaseParams               defaultParams;
+    private String                                  lineageType = LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
 
     public LineageOnDemandRequest() {
         this.attributes = new HashSet<>();
@@ -64,6 +67,14 @@ public void setRelationshipTraversalFilters(SearchParameters.FilterCriteria rela
         this.relationshipTraversalFilters = relationshipTraversalFilters;
     }
 
+    public String getLineageType() {
+        return lineageType;
+    }
+
+    public void setLineageType(String lineageType) {
+        this.lineageType = lineageType;
+    }
+
     public Set<String> getAttributes() {
         return attributes;
     }

repository/src/main/java/org/apache/atlas/discovery/AtlasLineageContext.java

@@ -45,6 +45,7 @@ public class AtlasLineageContext {
 
     private boolean isDataset;
     private boolean isProcess;
+    private boolean isProduct;
 
     private Set<String> attributes;
     private Set<String> ignoredProcesses;
@@ -111,6 +112,14 @@ public void setProcess(boolean process) {
         isProcess = process;
     }
 
+    public boolean isProduct() {
+        return isProduct;
+    }
+
+    public void setProduct(boolean product) {
+        isProduct = product;
+    }
+
     public AtlasLineageInfo.LineageDirection getDirection() {
         return direction;
     }

repository/src/main/java/org/apache/atlas/discovery/AtlasLineageListContext.java

@@ -8,6 +8,8 @@
 import org.apache.commons.collections.Predicate;
 import java.util.Set;
 
+import static org.apache.atlas.model.lineage.LineageListRequest.LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
+
 public final class AtlasLineageListContext {
     private String                              guid;
     private int                                 size;
@@ -23,6 +25,7 @@ public final class AtlasLineageListContext {
     private int                                 currentEntityCounter;
     private boolean                             depthLimitReached;
     private boolean                             hasMoreUpdated;
+    private String                              lineageType = LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
     private Boolean                             immediateNeighbours;
 
     public AtlasLineageListContext(LineageListRequest lineageListRequest, AtlasTypeRegistry typeRegistry) {
@@ -36,6 +39,7 @@ public AtlasLineageListContext(LineageListRequest lineageListRequest, AtlasTypeR
         this.edgeTraversalPredicate = constructInMemoryPredicate(typeRegistry, lineageListRequest.getRelationshipTraversalFilters());
         this.attributes = lineageListRequest.getAttributes();
         this.relationAttributes = lineageListRequest.getRelationAttributes();
+        this.lineageType = lineageListRequest.getLineageType();
         this.immediateNeighbours = lineageListRequest.getImmediateNeighbours();
     }
 
@@ -131,6 +135,14 @@ public void setCurrentFromCounter(int currentFromCounter) {
         this.currentFromCounter = currentFromCounter;
     }
 
+    public String getLineageType() {
+        return lineageType;
+    }
+
+    public void setLineageType(String lineageType) {
+        this.lineageType = lineageType;
+    }
+
     public int getCurrentEntityCounter() {
         return currentEntityCounter;
     }

repository/src/main/java/org/apache/atlas/discovery/AtlasLineageOnDemandContext.java

@@ -14,6 +14,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.apache.atlas.model.lineage.LineageListRequest.LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
+
 public class AtlasLineageOnDemandContext {
     private static final Logger LOG = LoggerFactory.getLogger(AtlasLineageContext.class);
 
@@ -24,13 +26,16 @@ public class AtlasLineageOnDemandContext {
     private Set<String>                             relationAttributes;
     private LineageOnDemandBaseParams               defaultParams;
 
+    private String                                  lineageType = LINEAGE_TYPE_DATASET_PROCESS_LINEAGE;
+
     public AtlasLineageOnDemandContext(LineageOnDemandRequest lineageOnDemandRequest, AtlasTypeRegistry typeRegistry) {
         this.constraints        = lineageOnDemandRequest.getConstraints();
         this.attributes         = lineageOnDemandRequest.getAttributes();
         this.relationAttributes = lineageOnDemandRequest.getRelationAttributes();
         this.defaultParams      = lineageOnDemandRequest.getDefaultParams();
         this.vertexPredicate    = constructInMemoryPredicate(typeRegistry, lineageOnDemandRequest.getEntityTraversalFilters());
         this.edgePredicate      = constructInMemoryPredicate(typeRegistry, lineageOnDemandRequest.getRelationshipTraversalFilters());
+        this.lineageType        = lineageOnDemandRequest.getLineageType();
     }
 
     public Map<String, LineageOnDemandConstraints> getConstraints() {
@@ -57,6 +62,14 @@ public void setEdgePredicate(Predicate edgePredicate) {
         this.edgePredicate = edgePredicate;
     }
 
+    public String getLineageType() {
+        return lineageType;
+    }
+
+    public void setLineageType(String lineageType) {
+        this.lineageType = lineageType;
+    }
+
     public Set<String> getAttributes() {
         return attributes;
     }