Skip to content

Commit

Permalink
Remove CLI
Browse files Browse the repository at this point in the history 
Remove CLI
  • Loading branch information
@hhpatel14
hhpatel14 committed Nov 18, 2023
1 parent 4580a96 commit 360e2e8
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/windup/cli/KantraCliParamBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class KantraCliParamBuilder {

public static List<String> buildParams(WindupConfiguration config, String windupHome) {
public static List<String> buildParams(WindupConfiguration config) {
List<String> params = Lists.newArrayList();
Map<String, Object> options = config.getOptions();
params.add("analyze");
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/jboss/tools/intellij/windup/cli/RulesetParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ public static void parseRulesetForKantraConfig (WindupConfiguration configuratio
if(configuration.getSummary() != null){
configuration.getSummary().setRulesets(parseRuleset(outputLocation));
parseIncidents(configuration.getRulesets(), configuration);
System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ size of the Incident $$$$$$$$$$$$$$$");
System.out.println("size of the Incident: ");
System.out.println(configuration.getSummary().getIssues().size());
}else {
System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ configuration.getSummary() != null $$$$$$$$$$$$$$");
System.out.println(" configuration.getSummary() is null");
}

}else{
Expand All @@ -68,14 +68,17 @@ public static void parseIncidents (List<WindupConfiguration.Ruleset> rulesets, W
for (WindupConfiguration.Ruleset ruleset: rulesets){
Map<String, Violation> violations = ruleset.getViolations();
if (violations != null ){
for(WindupConfiguration.Violation violation : violations.values()){
for (Map.Entry<String, WindupConfiguration.Violation> entry : violations.entrySet()) {
//for(WindupConfiguration.Violation violation : violations.values()){
WindupConfiguration.Violation violation = entry.getValue();
List<WindupConfiguration.Incident> incidents = violation.getIncidents();
for (WindupConfiguration.Incident incident : incidents ) {
incident.id = WindupConfiguration.generateUniqueId();
incident.title = violation.getDescription().split("\n", 2)[0];
ArrayList<String> inputs = (ArrayList<String>) configuration.getOptions().get("input");
String input = inputs.get(0);
String filePath = incident.getUri();;
incident.ruleId = entry.getKey();
String absolutePath = filePath.substring(filePath.indexOf("/source") + "/source".length());
System.out.println("input: " + input);
System.out.println("File path of the incidents: " + incident.file);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/jboss/tools/intellij/windup/cli/RunAnalysisCommandHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public class RunAnalysisCommandHandler {
private WindupConsole console;

public RunAnalysisCommandHandler(Project project,
String executable,
List<String> params,
WindupConsole console,
Runnable onComplete) {
Expand All @@ -46,7 +45,7 @@ public RunAnalysisCommandHandler(Project project,
commandLine = new GeneralCommandLine();
commandLine.setExePath("kantra");
commandLine.addParameters(params);
System.out.println("This is RunAnalysis Command handler............. constructor");
// System.out.println("This is RunAnalysis Command handler............. constructor");
System.out.println(onComplete.toString());
this.progressMonitor = new ProgressMonitor(this.createProgressListener(onComplete));
}
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliProcessHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class WindupCliProcessHandler extends OSProcessHandler {
private WindupConsole console;
private boolean isCancelled = false;

int i = 0;
// int i = 0;

public WindupCliProcessHandler(
Process process,
Expand All @@ -44,10 +44,10 @@ public WindupCliProcessHandler(
@Override
public final void notifyTextAvailable(@NotNull String text, @NotNull final Key outputType) {

if(i <= 10){
System.out.println ("This is output from Kantra -----------------------> " + text);
}
i++;
// if(i <= 10){
// System.out.println ("This is output from Kantra -----------------------> " + text);
// }
// i++;
if (progressIndicator.isCanceled()) {
destroyProcess();
RunConfigurationAction.running = false;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/tools/intellij/windup/cli/WindupCliRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void run(WindupConfiguration configuration,
CliListener listener) {
String javaHome = "";
String windupCli = "kantra";
List<String> params = KantraCliParamBuilder.buildParams(configuration, windupCli);
List<String> params = KantraCliParamBuilder.buildParams(configuration);
WindupCliRunner.executeAnalysis(windupCli, javaHome, params, progressMonitor, listener);
}

Expand Down
33 changes: 15 additions & 18 deletions src/main/java/org/jboss/tools/intellij/windup/explorer/actions/RunConfigurationAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,11 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
ConfigurationNode node = (ConfigurationNode)super.adjust(selected);
WindupConfiguration configuration = node.getValue();
ModelService modelService = node.getModelService();
System.out.println("********************* This is actionPerformed****************************");
if (this.validateConfiguration(configuration)) {
String executable = (String)configuration.getOptions().get("cli");
try {
String windupHome = new File(executable).getParentFile().getParent();
List<String> params = KantraCliParamBuilder.buildParams(configuration, windupHome);
List<String> params = KantraCliParamBuilder.buildParams(configuration);
RunAnalysisCommandHandler handler = new RunAnalysisCommandHandler(
anActionEvent.getProject(),
executable,
params,
console,
() ->{
Expand Down Expand Up @@ -85,23 +81,24 @@ private void loadAnalysisResults(WindupConfiguration configuration, ModelService

private boolean validateConfiguration(WindupConfiguration configuration) {
boolean valid = true;
String cliLocation = (String)configuration.getOptions().get("cli");
// String cliLocation = (String)configuration.getOptions().get("cli");
String cliLocation = "trying to avoid the cli ERROR";
if (cliLocation == null || "".equals(cliLocation)) {
valid = false;
WindupNotifier.notifyError("Path to CLI executable required.");
}
else if (cliLocation != null) {
cliLocation = this.resolveCliPath(cliLocation);
configuration.getOptions().put("cli", cliLocation);
if (!new File(cliLocation).exists()) {
valid = false;
WindupNotifier.notifyError("Path to CLI executable does not exist.");
}
else if (!Files.isExecutable(Paths.get(cliLocation))) {
valid = false;
WindupNotifier.notifyError("Path to CLI executable is not executable.");
}
}
// else if (cliLocation != null) {
// cliLocation = this.resolveCliPath(cliLocation);
// configuration.getOptions().put("cli", cliLocation);
// if (!new File(cliLocation).exists()) {
// valid = false;
// WindupNotifier.notifyError("Path to CLI executable does not exist.");
// }
// else if (!Files.isExecutable(Paths.get(cliLocation))) {
// valid = false;
// WindupNotifier.notifyError("Path to CLI executable is not executable.");
// }
// }
List<String> input = (List<String>)configuration.getOptions().get("input");
if (input == null || input.isEmpty()) {
WindupNotifier.notifyError("Path to input required.");
Expand Down

0 comments on commit 360e2e8

Please sign in to comment.