Skip to content

Commit 675089d

Browse files
authored
feat: moving stack analysis for npm package manager to be used by new exhort java api (#126)
Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
1 parent b07c119 commit 675089d

3 files changed

Lines changed: 31 additions & 16 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories {
1010
}
1111
maven { url 'https://jitpack.io' }
1212
maven {
13-
url 'https://maven.pkg.github.com/RHEcosystemAppEng/crda-java-api'
13+
url 'https://maven.pkg.github.com/RHEcosystemAppEng/exhort-java-api'
1414
credentials {
1515
username = project.findProperty("gpr.username") ?: System.getenv("GITHUB_USERNAME")
1616
password = project.findProperty("gpr.token") ?: System.getenv("GITHUB_TOKEN")
@@ -60,7 +60,7 @@ dependencies {
6060
}
6161
implementation 'org.kohsuke:github-api:1.314'
6262
implementation 'org.apache.commons:commons-compress:1.21'
63-
implementation 'com.redhat.crda:crda-java-api:0.0.1-SNAPSHOT'
63+
implementation 'com.redhat.exhort:exhort-java-api:0.0.1-SNAPSHOT'
6464
testImplementation('junit:junit:4.13.1')
6565
}
6666

src/main/java/org/jboss/tools/intellij/crda/ApiService.java renamed to src/main/java/org/jboss/tools/intellij/exhort/ApiService.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.jboss.tools.intellij.crda;
1+
package org.jboss.tools.intellij.exhort;
22

33
import com.intellij.openapi.components.Service;
4-
import com.redhat.crda.Api;
5-
import com.redhat.crda.impl.CrdaApi;
6-
import com.redhat.crda.tools.Ecosystem;
4+
import com.redhat.exhort.Api;
5+
import com.redhat.exhort.impl.ExhortApi;
6+
import com.redhat.exhort.tools.Ecosystem;
77
import org.jboss.tools.intellij.analytics.TelemetryService;
88

99
import java.io.IOException;
@@ -22,14 +22,14 @@ public String toString() {
2222
}
2323
}
2424

25-
private final Api crdaApi;
25+
private final Api exhortApi;
2626

2727
public ApiService() {
28-
this(new CrdaApi());
28+
this(new ExhortApi());
2929
}
3030

31-
ApiService(Api crdaApi) {
32-
this.crdaApi = crdaApi;
31+
ApiService(Api exhortApi) {
32+
this.exhortApi = exhortApi;
3333
}
3434

3535
public Path getStackAnalysis(
@@ -44,8 +44,8 @@ public Path getStackAnalysis(
4444
telemetryMsg.property(TelemetryKeys.MANIFEST.toString(), manifestName);
4545

4646
try {
47-
var htmlContent = crdaApi.stackAnalysisHtml(manifestPath);
48-
var tmpFile = Files.createTempFile("crda_", ".html");
47+
var htmlContent = exhortApi.stackAnalysisHtml(manifestPath);
48+
var tmpFile = Files.createTempFile("exhort_", ".html");
4949
Files.write(tmpFile, htmlContent.get());
5050

5151
telemetryMsg.send();

src/main/java/org/jboss/tools/intellij/stackanalysis/SaAction.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
import com.intellij.openapi.vfs.VirtualFile;
2424
import com.intellij.psi.PsiFile;
2525

26-
import org.jboss.tools.intellij.crda.ApiService;
27-
import com.redhat.crda.tools.Ecosystem;
26+
import org.jboss.tools.intellij.exhort.ApiService;
2827
import org.jboss.tools.intellij.analytics.Platform;
2928
import org.jetbrains.annotations.NotNull;
3029

@@ -52,9 +51,9 @@ public void actionPerformed(@NotNull AnActionEvent event) {
5251

5352
// Get SA report for given manifest file.
5453
String reportLink;
55-
if ("pom.xml".equals(manifestFile.getName())) {
54+
if ("pom.xml".equals(manifestFile.getName()) || "package.json".equals(manifestFile.getName()) ) {
5655
reportLink = apiService.getStackAnalysis(
57-
"maven",
56+
determinePackageManagerName(manifestFile.getName()),
5857
manifestFile.getName(),
5958
manifestFile.getPath()
6059
).toUri().toString();
@@ -81,6 +80,22 @@ public void actionPerformed(@NotNull AnActionEvent event) {
8180
}
8281
}
8382

83+
private String determinePackageManagerName(String name) {
84+
String packageManager;
85+
switch(name)
86+
{
87+
case "pom.xml":
88+
packageManager = "maven";
89+
break;
90+
case "package.json":
91+
packageManager = "npm";
92+
break;
93+
default:
94+
throw new IllegalArgumentException("package manager not implemented");
95+
}
96+
return packageManager;
97+
}
98+
8499

85100
/**
86101
* <p>Updates the state of the action, Action is show if this method returns true.</p>

0 commit comments

Comments
 (0)