Skip to content

Fix rerun language handling #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
switchover wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fix rerun language handling #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/java/com/samsungsds/analyst/code/api/CodeAnalystFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ public static CodeAnalyst create(Language language) {
return new JavaScriptCodeAnalystImpl();
} else if (language == Language.CSHARP) {
return new CSharpCodeAnalystImpl();
} else { // Python
} else if (language == Language.PYTHON) {
return new PythonCodeAnalystImpl();
} else {
throw new IllegalArgumentException("Unsupported language: " + language);
}
}
}
3 changes: 1 addition & 2 deletions src/main/java/com/samsungsds/analyst/code/api/impl/JavaCodeAnalystImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public String analyze(String where, ArgumentInfo argument, AbstractFileInfo targ
System.out.println(" - with seperated output option");
}

CliParser cli = new CliParser(arguments, Language.JAVA);
CliParser cli = new CliParser(arguments, argument.getMode().getLanguageType());

cli.setInstanceKey(getUniqueId());

Expand Down Expand Up @@ -361,4 +361,3 @@ private String getModeParameter(AnalysisMode mode, boolean hasWebappAugument) {

return parameter.toString();
}
}
4 changes: 4 additions & 0 deletions src/main/java/com/samsungsds/analyst/code/main/cli/CliParseProcessorForCSharp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ public boolean parseAndSaveParsedValue(CliParser cliParser, Options options, Str

if (cmd.hasOption("r")) {
getOptionsFromOutFile(parsedValue, cmd.getOptionValue("r"));
if (!parsedValue.getLanguage().equalsIgnoreCase("csharp") && !parsedValue.getLanguage().equalsIgnoreCase("c#")) {
System.out.println("Error: Language mismatch. Expected C# but found " + parsedValue.getLanguage());
return false;
}
}

if (cmd.hasOption("catalog")) {
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/samsungsds/analyst/code/main/cli/CliParseProcessorForJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ public boolean parseAndSaveParsedValue(CliParser cliParser, Options options, Str

if (cmd.hasOption("r")) {
getOptionsFromOutFile(parsedValue, cmd.getOptionValue("r"));
if (!parsedValue.getLanguage().equalsIgnoreCase("java")) {
System.out.println("Error: Language mismatch. Expected Java but found " + parsedValue.getLanguage());
return false;
}
}

if (cmd.hasOption("catalog")) {
Expand Down Expand Up @@ -278,6 +282,6 @@ public boolean parseAndSaveParsedValue(CliParser cliParser, Options options, Str
@Override
public String getModeErrorMessage() {
return "'mode' option can only have 'code-size', 'duplication', 'complexity', 'sonarjava', 'pmd', 'findbugs', 'findsecbugs', " +
"'javascript'(sonarjs), 'css', 'html', 'dependency', 'unusedcode', 'ckmetrics', and 'checkstyle' (with or without '-')";
"'javascript'(sonarjs), 'css', 'html', 'dependency', 'unusedcode', 'ckmetrics, and 'checkstyle' (with or without '-')";
}
}
4 changes: 4 additions & 0 deletions src/main/java/com/samsungsds/analyst/code/main/cli/CliParseProcessorForJavaScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ public boolean parseAndSaveParsedValue(CliParser cliParser, Options options, Str

if (cmd.hasOption("r")) {
getOptionsFromOutFile(parsedValue, cmd.getOptionValue("r"));
if (!parsedValue.getLanguage().equalsIgnoreCase("javascript")) {
System.out.println("Error: Language mismatch. Expected JavaScript but found " + parsedValue.getLanguage());
return false;
}
}

if (cmd.hasOption("catalog")) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/samsungsds/analyst/code/main/cli/CliParseProcessorForPython.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ public boolean parseAndSaveParsedValue(CliParser cliParser, Options options, Str

if (cmd.hasOption("r")) {
getOptionsFromOutFile(parsedValue, cmd.getOptionValue("r"));
if (!parsedValue.getLanguage().equalsIgnoreCase("python")) {
System.out.println("Error: Language mismatch. Expected Python but found " + parsedValue.getLanguage());
return false;
}
}

if (cmd.hasOption("catalog")) {
Expand Down