Skip to content

Feature/devassist module extraction v2 #262

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
cx-aniket-shinde wants to merge 3 commits into
base: integration/devassist
Choose a base branch
from
Open

Feature/devassist module extraction v2 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fccb643
module setup
cx-aniket-shinde Aug 7, 2026
86b13ef
Gutter icons
cx-aniket-shinde Aug 8, 2026
ee6a21d
lib
cx-aniket-shinde Aug 8, 2026
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
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.20.jar filter=lfs diff
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.21.jar filter=lfs diff=lfs merge=lfs -text
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.23.jar filter=lfs diff=lfs merge=lfs -text
checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.24.jar filter=lfs diff=lfs merge=lfs -text
devassist-lib/lib/*.jar filter=lfs diff=lfs merge=lfs -text
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
.vs/
*.jar
!checkmarx-ast-eclipse-plugin/lib/*.jar
!devassist-lib/lib/*.jar
6 changes: 3 additions & 3 deletions checkmarx-ast-eclipse-plugin-tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand All @@ -14,7 +13,8 @@
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/mockito-core-5.14.2.jar"/>
<classpathentry kind="lib" path="lib/powermock-core-2.0.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/byte-buddy-1.17.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/byte-buddy-agent-1.17.8.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand Down
27 changes: 1 addition & 26 deletions checkmarx-ast-eclipse-plugin-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,10 @@
<formats>
<format>XML</format>
<format>CSV</format>
<format>HTML</format>
</formats>
</configuration>
</execution>
<execution>
<id>check</id>
<phase>verify</phase>
<goals><goal>check</goal></goals>
<configuration>
<dataFile>${project.build.directory}/jacoco.exec</dataFile>
<classesDirectory>${project.basedir}/../checkmarx-ast-eclipse-plugin/target/classes</classesDirectory>
<excludes>
<exclude>org/eclipse/wb/swt/SWTResourceManager.class</exclude>
</excludes>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.30</minimum>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...pse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/TestFilterState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.enums.State;
import com.checkmarx.eclipse.views.actions.ToolBarActions;

Expand Down
2 changes: 1 addition & 1 deletion ...-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/TestTriage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.junit.jupiter.api.Test;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.utils.PluginConstants;

public class TestTriage extends BaseUITest {
Expand Down
2 changes: 1 addition & 1 deletion ...-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/TestUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.junit.jupiter.api.Test;

import com.checkmarx.eclipse.enums.ActionName;
import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.utils.PluginConstants;
import com.checkmarx.eclipse.views.actions.ToolBarActions;

Expand Down
2 changes: 1 addition & 1 deletion ...sts/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/enums/SeverityExtendedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;

class SeverityExtendedTest {

Expand Down
2 changes: 1 addition & 1 deletion ...lugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/enums/SeverityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import org.junit.jupiter.api.Test;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;

class SeverityTest {

Expand Down
2 changes: 1 addition & 1 deletion ...tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/runner/AuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.checkmarx.ast.wrapper.CxException;
import com.checkmarx.ast.wrapper.CxWrapper;
import com.checkmarx.eclipse.runner.Authenticator;
import com.checkmarx.eclipse.utils.CxLogger;
import com.checkmarx.eclipse.common.utils.CxLogger;
import com.checkmarx.eclipse.utils.PluginConstants;

class AuthenticatorTest {
Expand Down
2 changes: 1 addition & 1 deletion ...lugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/utils/CxLoggerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import org.junit.jupiter.api.Test;

import com.checkmarx.eclipse.utils.CxLogger;
import com.checkmarx.eclipse.common.utils.CxLogger;

class CxLoggerTest {

Expand Down
2 changes: 1 addition & 1 deletion ...in-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/utils/PluginUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import com.checkmarx.ast.results.result.Data;
import com.checkmarx.ast.results.result.Node;
import com.checkmarx.ast.results.result.Result;
import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.properties.Preferences;
import com.checkmarx.eclipse.utils.PluginConstants;
import com.checkmarx.eclipse.utils.PluginUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/checkmarx/ast/eclipse/plugin/tests/unit/views/actions/ToolBarActionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import com.checkmarx.eclipse.views.DataProvider;

import com.checkmarx.eclipse.enums.PluginListenerType;
import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.views.DisplayModel;
import com.checkmarx.eclipse.views.PluginListenerDefinition;
import com.checkmarx.eclipse.views.actions.ToolBarActions;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/checkmarx/ast/eclipse/plugin/tests/unit/views/filters/ActionFiltersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.checkmarx.eclipse.views.filters.ActionFilters;
import com.checkmarx.eclipse.enums.ActionName;
import com.checkmarx.eclipse.enums.PluginListenerType;
import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.views.DataProvider;
import com.checkmarx.eclipse.views.PluginListenerDefinition;
import com.google.common.eventbus.EventBus;
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/checkmarx/ast/eclipse/plugin/tests/unit/views/filters/FilterStateExtendedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.mockito.MockedStatic;
import org.mockito.MockitoAnnotations;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.enums.State;
import com.checkmarx.eclipse.views.GlobalSettings;
import com.checkmarx.eclipse.views.filters.FilterState;
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/views/filters/FilterStateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.mockito.MockedStatic;
import org.mockito.Mockito;

import com.checkmarx.eclipse.enums.Severity;
import com.checkmarx.eclipse.common.enums.Severity;
import com.checkmarx.eclipse.enums.State;
import com.checkmarx.eclipse.views.GlobalSettings;
import com.checkmarx.eclipse.views.filters.FilterState;
Expand Down
20 changes: 8 additions & 12 deletions checkmarx-ast-eclipse-plugin/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,26 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="bin" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-2.0.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-reload4j-2.0.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-2.0.17.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.21.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.21.1.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.21.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.21.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.18.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ast-cli-java-wrapper-2.4.24.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.21.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.eclipse.mylyn.commons.ui_4.9.0.v20251121-0615.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org-eclipse-mylyn-commons-core.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.21.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.21.4.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.21.5.jar"/>
<classpathentry kind="src" output="bin" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
Expand Down
15 changes: 14 additions & 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 @@ -5,23 +5,35 @@ Bundle-SymbolicName: com.checkmarx.eclipse.plugin;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Checkmarx
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.editors,
org.eclipse.core.runtime,
org.eclipse.jdt.core,
org.eclipse.ui.ide,
org.eclipse.jface.text,
org.eclipse.text,
org.eclipse.jdt.ui,
org.eclipse.jgit,
org.eclipse.e4.core.services,
com.google.guava,
org.eclipse.e4.ui.di,
org.apache.commons.lang3,
org.eclipse.mylyn.commons.ui,
org.eclipse.mylyn.commons.core,
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1"
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1",
com.checkmarx.eclipse.common,
com.checkmarx.eclipse.devassist
Automatic-Module-Name: com.checkmarx.eclipse
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.eclipse.core.resources,
org.osgi.service.event;version="1.4.1"
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.checkmarx.eclipse.Activator
Export-Package: com.checkmarx.ast.asca,
com.checkmarx.ast.wrapper,
com.checkmarx.eclipse.enums,
com.checkmarx.eclipse.properties,
com.checkmarx.eclipse.utils
Bundle-ClassPath: .,
lib/slf4j-simple-2.0.17.jar,
lib/slf4j-reload4j-2.0.17.jar,
Expand All @@ -33,3 +45,4 @@ Bundle-ClassPath: .,
lib/ast-cli-java-wrapper-2.4.24.jar,
lib/org.eclipse.mylyn.commons.ui_4.9.0.v20251121-0615.jar,
lib/org-eclipse-mylyn-commons-core.jar

12 changes: 2 additions & 10 deletions checkmarx-ast-eclipse-plugin/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
icons/,\
lib/slf4j-simple-2.0.17.jar,\
lib/slf4j-reload4j-2.0.17.jar,\
lib/slf4j-api-2.0.17.jar,\
lib/jackson-annotations-2.21.jar,\
lib/jackson-core-2.21.1.jar,\
lib/commons-lang3-3.18.0.jar,\
lib/ast-cli-java-wrapper-2.4.24.jar,\
lib/org.eclipse.mylyn.commons.ui_4.9.0.v20251121-0615.jar,\
lib/jackson-databind-2.21.1.jar,\
.,\
lib/org-eclipse-mylyn-commons-core.jar
lib/org-eclipse-mylyn-commons-core.jar,\
.
source.. = src/
Binary file added checkmarx-ast-eclipse-plugin/icons/cx-one-assist-cube.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions checkmarx-ast-eclipse-plugin/icons/severity/critical.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions checkmarx-ast-eclipse-plugin/icons/severity/critical_16.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions checkmarx-ast-eclipse-plugin/icons/severity/critical_16_dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading