integration branch for multiple pr (AST-136045)

.gitattributes

@@ -12,3 +12,4 @@ checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.18.jar filter=lfs diff
 checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.20.jar filter=lfs diff=lfs merge=lfs -text
 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

ast-cli-java-wrapper.version

@@ -1 +1 @@
-2.4.23
+2.4.24

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/ui/BaseUITest.java

@@ -26,7 +26,7 @@
 
 public abstract class BaseUITest {
 
-	private static final String INFO_SUCCESSFUL_CONNECTION = "Successfully authenticated to Checkmarx One server!";
+	private static final String INFO_SUCCESSFUL_CONNECTION = "You are connected to Checkmarx One";
 
 	protected static final String ASSERT_FILTER_ACTIONS_IN_TOOLBAR = "All filter actions must be in the tool bar";
 

checkmarx-ast-eclipse-plugin-tests/src/test/java/checkmarx/ast/eclipse/plugin/tests/unit/runner/AuthenticatorTest.java

@@ -7,12 +7,14 @@
 
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedConstruction;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 
 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.utils.PluginConstants;
 
 class AuthenticatorTest {
@@ -24,14 +26,15 @@ void testDoAuthenticationSuccess() throws Exception {
 
         try (MockedConstruction<CxWrapper> mocked =
                      Mockito.mockConstruction(CxWrapper.class,
-                             (mock, context) -> when(mock.authValidate()).thenReturn("SUCCESS"))) {
+                             (mock, context) -> when(mock.authValidate()).thenReturn("SUCCESS"));
+             MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {
 
             Authenticator authenticator = new Authenticator(mockLogger);
 
             String result = authenticator.doAuthentication("dummyKey", "--param");
 
             assertEquals("SUCCESS", result);
-            verify(mockLogger).info("Authentication Status: SUCCESS");
+            mockedCxLogger.verify(() -> CxLogger.info(String.format(PluginConstants.INFO_AUTHENTICATION_STATUS, "SUCCESS")));
         }
     }
 
@@ -43,17 +46,18 @@ void testDoAuthenticationIOException() throws Exception {
         try (MockedConstruction<CxWrapper> mocked =
                      Mockito.mockConstruction(CxWrapper.class,
                              (mock, context) -> when(mock.authValidate())
-                                     .thenThrow(new IOException("IO error")))) {
+                                     .thenThrow(new IOException("IO error")));
+             MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {
 
             Authenticator authenticator = new Authenticator(mockLogger);
 
             String result = authenticator.doAuthentication("dummyKey", "--param");
 
             assertEquals("IO error", result);
-            verify(mockLogger).error(
-            	    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "IO error")),
-            	    any(IOException.class)
-            	);
+            mockedCxLogger.verify(() -> CxLogger.error(
+                    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "IO error")),
+                    any(IOException.class)
+            ));
         }
     }
 
@@ -65,17 +69,18 @@ void testDoAuthenticationInterruptedException() throws Exception {
         try (MockedConstruction<CxWrapper> mocked =
                      Mockito.mockConstruction(CxWrapper.class,
                              (mock, context) -> when(mock.authValidate())
-                                     .thenThrow(new InterruptedException("Interrupted")))) {
+                                     .thenThrow(new InterruptedException("Interrupted")));
+             MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {
 
             Authenticator authenticator = new Authenticator(mockLogger);
 
             String result = authenticator.doAuthentication("dummyKey", "--param");
 
             assertEquals("Interrupted", result);
-            verify(mockLogger).error(
-            	    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Interrupted")),
-            	    any(InterruptedException.class)
-            	);
+            mockedCxLogger.verify(() -> CxLogger.error(
+                    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Interrupted")),
+                    any(InterruptedException.class)
+            ));
         }
     }
 
@@ -87,17 +92,18 @@ void testDoAuthenticationCxException() throws Exception {
         try (MockedConstruction<CxWrapper> mocked =
                      Mockito.mockConstruction(CxWrapper.class,
                              (mock, context) -> when(mock.authValidate())
-                                     .thenThrow(new CxException(1, "Cx error")))) {
+                                     .thenThrow(new CxException(1, "Cx error")));
+             MockedStatic<CxLogger> mockedCxLogger = Mockito.mockStatic(CxLogger.class)) {
 
             Authenticator authenticator = new Authenticator(mockLogger);
 
             String result = authenticator.doAuthentication("dummyKey", "--param");
 
             assertEquals("Cx error", result);
-            verify(mockLogger).error(
-            	    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Cx error")),
-            	    any(CxException.class)
-            	);
+            mockedCxLogger.verify(() -> CxLogger.error(
+                    eq(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, "Cx error")),
+                    any(CxException.class)
+            ));
         }
     }
 

checkmarx-ast-eclipse-plugin/.classpath

@@ -12,7 +12,7 @@
 	<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 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.23.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"/>

checkmarx-ast-eclipse-plugin/META-INF/MANIFEST.MF

@@ -30,6 +30,6 @@ Bundle-ClassPath: .,
  lib/jackson-core-2.21.1.jar,
  lib/jackson-databind-2.21.1.jar,
  lib/commons-lang3-3.18.0.jar,
- lib/ast-cli-java-wrapper-2.4.23.jar,
+ 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

checkmarx-ast-eclipse-plugin/build.properties

@@ -8,7 +8,7 @@ bin.includes = plugin.xml,\
                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.23.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,\
                .,\

checkmarx-ast-eclipse-plugin/lib/.gitattributes

@@ -1 +1,15 @@
 checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.1.8.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.0.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.1.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.2.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.3.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.4.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.9.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.14-oss.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.15.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.16-dev.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.18.jar filter=lfs diff=lfs merge=lfs -text
+checkmarx-ast-eclipse-plugin/lib/ast-cli-java-wrapper-2.4.20.jar filter=lfs diff=lfs merge=lfs -text
+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

checkmarx-ast-eclipse-plugin/plugin.xml

@@ -39,4 +39,8 @@
         </perspectiveExtension>
     </extension>
 
+    <extension point="org.eclipse.ui.startup">
+        <startup class="com.checkmarx.eclipse.startup.PluginStartup"/>
+    </extension>
+
 </plugin>

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/properties/PreferencesPage.java

@@ -137,14 +137,23 @@ public void widgetSelected(SelectionEvent e) {
 						return t.getMessage();
 					}
 				}).thenAccept((result) -> Display.getDefault().syncExec(() -> {
-					connectionLabel.setText(result);
+					connectionLabel.setText(mapAuthResult(result));
 					getFieldEditorParent().layout();
 					connectionButton.setEnabled(true);
 				}));
 			}
 		});
 	}
 
+
+
+	private static String mapAuthResult(String result) {
+		if (result != null && result.contains(PluginConstants.AUTH_SUCCESS_PATTERN)) {
+			return PluginConstants.AUTH_SUCCESS_DISPLAY;
+		}
+		return result;
+	}
+
 	private FieldEditor space() {
 		return new LabelFieldEditor("", getFieldEditorParent());
 	}

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/runner/Authenticator.java

@@ -33,10 +33,10 @@ public String doAuthentication(String apiKey, String additionalParams) {
 	       try {
 	           CxWrapper wrapper = new CxWrapper(config, log);
 	           String cxValidateOutput = wrapper.authValidate();
-	           log.info(AUTH_STATUS + cxValidateOutput);
+	           CxLogger.info(String.format(PluginConstants.INFO_AUTHENTICATION_STATUS, cxValidateOutput));
 	           return cxValidateOutput;
 	       } catch (IOException | InterruptedException | CxException e) {
-	           log.error(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, e.getMessage()), e);
+	           CxLogger.error(String.format(PluginConstants.ERROR_AUTHENTICATING_AST, e.getMessage()), e);
 	           return e.getMessage();
 	       }
 	   }

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/startup/PluginStartup.java

@@ -0,0 +1,31 @@
+package com.checkmarx.eclipse.startup;
+
+import org.eclipse.ui.IStartup;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+
+import com.checkmarx.eclipse.utils.CxLogger;
+
+public class PluginStartup implements IStartup {
+
+	private static final String VIEW_ID = "com.checkmarx.eclipse.views.CheckmarxView";
+
+	@Override
+	public void earlyStartup() {
+		PlatformUI.getWorkbench().getDisplay().asyncExec(() -> {
+			try {
+				IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+				if (window != null) {
+					IWorkbenchPage page = window.getActivePage();
+					if (page != null && page.findView(VIEW_ID) == null) {
+						page.showView(VIEW_ID);
+					}
+				}
+			} catch (PartInitException e) {
+				CxLogger.error("Failed to open Checkmarx One view on startup: " + e.getMessage(), e);
+			}
+		});
+	}
+}

checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/utils/PluginConstants.java

@@ -49,6 +49,8 @@ public class PluginConstants {
 	public static final String INFO_CHANGE_SCAN_EVENT_NOT_TRIGGERED = "Change scan id event not triggered. Request already running: %s. Scan id results already retrieved: %s";
 	public static final String INFO_CHANGE_BRANCH_EVENT_NOT_TRIGGERED = "Change branch event not triggered. Branch already selected";
 	public static final String INFO_CHANGE_PROJECT_EVENT_NOT_TRIGGERED = "Change project event not triggered. Project already selected";
+	public static final String AUTH_SUCCESS_PATTERN = "Successfully authenticated";
+	public static final String AUTH_SUCCESS_DISPLAY = "You are connected to Checkmarx One";
 
 	/******************************** TREE MESSAGES ********************************/
 	public static final String TREE_INVALID_SCAN_ID_FORMAT = "Invalid scan id format.";