Skip to content

Update ast-cli-java-wrapper Docker image with 1.0.31 #30

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

Merged
cx-pedro-lopes merged 2 commits into from
Feb 25, 2022
Merged

Update ast-cli-java-wrapper Docker image with 1.0.31 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ed58d
Update ast-cli-java-wrapper to 1.0.31
Feb 25, 2022
1a6a7b7
update cli
cx-pedro-lopes Feb 25, 2022
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
2 changes: 1 addition & 1 deletion ast-cli-java-wrapper.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.27
1.0.31
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-1.0.27.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-1.0.31.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
Expand Down
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Bundle-ClassPath: lib/slf4j-simple-1.7.5.jar,
lib/jackson-core-2.12.4.jar,
lib/jackson-databind-2.12.4.jar,
lib/commons-lang3-3.12.0.jar,
lib/ast-cli-java-wrapper-1.0.27.jar,
lib/ast-cli-java-wrapper-1.0.31.jar,
.
2 changes: 1 addition & 1 deletion checkmarx-ast-eclipse-plugin/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ bin.includes = plugin.xml,\
lib/jackson-databind-2.12.4.jar,\
lib/commons-lang3-3.12.0.jar,\
.,\
lib/ast-cli-java-wrapper-1.0.27.jar
lib/ast-cli-java-wrapper-1.0.31.jar
source.. = src/
Binary file renamed ...lugin/lib/ast-cli-java-wrapper-1.0.27.jar → ...lugin/lib/ast-cli-java-wrapper-1.0.31.jar
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public static void updateFiltersEnabledAndCheckedState(List<Action> filterAction
}

if(!action.getId().equals(ActionName.FILTER_CHANGED.name())) {
// action.setChecked(FilterState.isFilterStateEnabled(action.getId()));
action.setChecked(FilterState.isSeverityEnabled(action.getId()));
}

Expand Down
26 changes: 13 additions & 13 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,17 +732,17 @@ public void selectionChanged(SelectionChangedEvent event) {
Project selectedProject = ((Project) selection.getFirstElement());

// Avoid non-sense trigger changed when opening the combo
if(selectedProject.getID().equals(currentProjectId)) {
if(selectedProject.getId().equals(currentProjectId)) {
CxLogger.info(PluginConstants.INFO_CHANGE_PROJECT_EVENT_NOT_TRIGGERED);

return;
}

onProjectChangePluginLoading(selectedProject.getID());
onProjectChangePluginLoading(selectedProject.getId());

Display.getDefault().asyncExec(new Runnable() {
public void run() {
currentBranches = DataProvider.getInstance().getBranchesForProject(selectedProject.getID());
currentBranches = DataProvider.getInstance().getBranchesForProject(selectedProject.getId());

branchComboViewer.setInput(currentBranches);
PluginUtils.setTextForComboViewer(branchComboViewer, currentBranches.isEmpty() ? NO_BRANCHES_AVAILABLE : BRANCH_COMBO_VIEWER_TEXT);
Expand Down Expand Up @@ -805,7 +805,7 @@ private String getProjectFromId(List<Project> projects, String projectId) {
return NO_PROJECTS_AVAILABLE;
}

Optional<Project> project = projects.stream().filter(p -> p.getID().equals(projectId)).findFirst();
Optional<Project> project = projects.stream().filter(p -> p.getId().equals(projectId)).findFirst();

return project.isPresent() ? project.get().getName() : PROJECT_COMBO_VIEWER_TEXT;
}
Expand Down Expand Up @@ -930,18 +930,18 @@ public void selectionChanged(SelectionChangedEvent event) {
Scan selectedScan = ((Scan) selection.getFirstElement());

// Avoid non-sense trigger changed when opening the combo
if(selectedScan.getID().equals(currentScanId) || alreadyRunning) {
CxLogger.info(String.format(PluginConstants.INFO_CHANGE_SCAN_EVENT_NOT_TRIGGERED, alreadyRunning, selectedScan.getID().equals(currentScanId)));
if(selectedScan.getId().equals(currentScanId) || alreadyRunning) {
CxLogger.info(String.format(PluginConstants.INFO_CHANGE_SCAN_EVENT_NOT_TRIGGERED, alreadyRunning, selectedScan.getId().equals(currentScanId)));

return;
}

onScanChangePluginLoading(selectedScan.getID());
onScanChangePluginLoading(selectedScan.getId());

Display.getDefault().asyncExec(new Runnable() {
public void run() {
alreadyRunning = true;
updateResultsTree(DataProvider.getInstance().getResultsForScanId(selectedScan.getID()), false);
updateResultsTree(DataProvider.getInstance().getResultsForScanId(selectedScan.getId()), false);
}
});
}
Expand Down Expand Up @@ -987,7 +987,7 @@ private String getScanNameFromId(List<Scan> scans, String scanId) {
return PluginConstants.COMBOBOX_SCAND_ID_NO_SCANS_AVAILABLE;
}

Optional<Scan> scan = scans.stream().filter(s -> s.getID().equals(scanId)).findFirst();
Optional<Scan> scan = scans.stream().filter(s -> s.getId().equals(scanId)).findFirst();

return scan.isPresent() ? formatScanLabel(scan.get()) : SCAN_COMBO_VIEWER_TEXT;
}
Expand All @@ -1001,7 +1001,7 @@ private String getScanNameFromId(List<Scan> scans, String scanId) {
private static String formatScanLabel(Scan scan) {
String updatedAtDate = PluginUtils.convertStringTimeStamp(scan.getUpdatedAt());

return String.format(FORMATTED_SCAN_LABEL, scan.getID(), updatedAtDate);
return String.format(FORMATTED_SCAN_LABEL, scan.getId(), updatedAtDate);

}

Expand Down Expand Up @@ -1050,7 +1050,7 @@ public void run() {
return;
}

String projectId = scan.getProjectID();
String projectId = scan.getProjectId();

List<Project> projectList = getProjects();

Expand All @@ -1065,7 +1065,7 @@ public void run() {
GlobalSettings.storeInPreferences(GlobalSettings.PARAM_PROJECT_ID, currentProjectId);

setSelectionForBranchComboViewer(scan.getBranch(), projectId);
setSelectionForScanIdComboViewer(scan.getID(), scan.getBranch());
setSelectionForScanIdComboViewer(scan.getId(), scan.getBranch());
}
});
}
Expand Down Expand Up @@ -1118,7 +1118,7 @@ private void setSelectionForScanIdComboViewer(String scanId, String branch) {
return;
}

Scan currentScan = scanList.stream().filter(scan -> scanId.equals(scan.getID())).findAny().orElse(null);
Scan currentScan = scanList.stream().filter(scan -> scanId.equals(scan.getId())).findAny().orElse(null);

scanIdComboViewer.setSelection(new StructuredSelection(currentScan != null ? currentScan : PluginConstants.EMPTY_STRING));
}
Expand Down