Merge pull request #15 from snyk/feat/drop-group-id-and-artifact-id

BREAKING CHANGE: drop unused groupId and artifactId attributes from response
snyk · Sep 25, 2018 · c730af2 · c730af2
2 parents d88bb07 + 5356121
commit c730af2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 428 deletions.
diff --git a/lib/gradle-dep-parser.js b/lib/gradle-dep-parser.js
@@ -4,10 +4,9 @@ module.exports = {
   parse: parse,
 };
 
-function parse(text, from) {
+function parse(text) {
   var data = processGradleOutput(text);
-  var depArray = createTree(
-    data.lines, data.omittedDeps, {from: [from]});
+  var depArray = createTree(data.lines, data.omittedDeps);
   fillOmittedDependencies(depArray, data.omittedDeps);
   var depTree = convertNodeArrayToObject(depArray);
   return depTree;
@@ -86,8 +85,6 @@ function getElementAsObject(element) {
   var artifactId = elementParts[1];
   var version = elementParts[2];
   return {
-    groupId: groupId,
-    artifactId: artifactId,
     version: version,
     name: groupId + ':' + artifactId,
     // array is required to keep the order for omitted deps,
@@ -119,14 +116,14 @@ function cloneDependencies(node, omittedDeps) {
   return clonedDeps;
 }
 
-function createTree(lines, omittedDeps, parentElement) {
+function createTree(lines, omittedDeps) {
   if (lines.length === 0) {
     return [];
   }
   var array = [];
   var currentLine = lines.shift();
   var currentIndent = getIndent(currentLine);
-  var current = getElementAsObject(currentLine, parentElement);
+  var current = getElementAsObject(currentLine);
   array.push(current);
 
   var nextLine = lines[0];
@@ -135,14 +132,14 @@ function createTree(lines, omittedDeps, parentElement) {
   while (nextLine) {
     nextIndent = getIndent(nextLine);
     if (nextIndent === currentIndent) {
-      next = getElementAsObject(lines[0], parentElement);
+      next = getElementAsObject(lines[0]);
       array.push(next);
       lines.shift();
     } else if (nextIndent > currentIndent) {
-      next = getElementAsObject(lines[0], current);
+      next = getElementAsObject(lines[0]);
       var subTreeLines = getSubTreeLines(lines, currentIndent);
       lines.splice(0, subTreeLines.length);
-      current.dependencies = createTree(subTreeLines, omittedDeps, current);
+      current.dependencies = createTree(subTreeLines, omittedDeps);
     }
     if (omittedDeps[current.name] === true) {
       // we have an omitted dependency somewhere