(hop) branch main updated: Disable Trust Store labels and fields when Ignore SSL certificate check is enabled (#6426)

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/main by this push:
     new 404adf3f83 Disable Trust Store labels and fields when Ignore SSL 
certificate check is enabled (#6426)
404adf3f83 is described below

commit 404adf3f837f67e6104bb7fa6dad76d569ce9870
Author: lance <leeh...@gmail.com>
AuthorDate: Tue Jan 20 15:00:23 2026 +0800

    Disable Trust Store labels and fields when Ignore SSL certificate check is 
enabled (#6426)
    
    Signed-off-by: lance <leeh...@gmail.com>
---
 .../hop/pipeline/transforms/rest/RestDialog.java   | 40 +++++++++++++---------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git 
a/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
 
b/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
index 3884487c1d..b60dc3cd53 100644
--- 
a/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
+++ 
b/plugins/transforms/rest/src/main/java/org/apache/hop/pipeline/transforms/rest/RestDialog.java
@@ -132,8 +132,14 @@ public class RestDialog extends BaseTransformDialog {
 
   private TextVar wResponseHeader;
 
+  /** trust store password label */
+  private Label wlTrustStorePassword;
+
   private TextVar wTrustStorePassword;
 
+  /** trust store file label */
+  private Label wlTrustStoreFile;
+
   private TextVar wTrustStoreFile;
 
   private Button wbTrustStoreFile;
@@ -199,8 +205,8 @@ public class RestDialog extends BaseTransformDialog {
 
     Group gSettings = setupSettingGroup(wGeneralComp);
 
-    setupRestConnectionLine(lsMod, middle, margin, wGeneralComp, gSettings);
-    setupUrlLine(lsMod, middle, margin, wGeneralComp, gSettings);
+    setupRestConnectionLine(margin, wGeneralComp, gSettings);
+    setupUrlLine(lsMod, middle, margin, gSettings);
     setupUrlInFieldLine(middle, margin, gSettings);
     setupUrlFieldNameLine(lsMod, middle, margin, gSettings);
     setupHttpMethodLine(lsMod, middle, margin, gSettings);
@@ -326,8 +332,8 @@ public class RestDialog extends BaseTransformDialog {
 
     Group gSSLTrustStore = setupTrustoreGroup(wSSLComp);
 
-    Button wbTrustStoreFile = setupTrustoreFileLine(lsMod, middle, margin, 
gSSLTrustStore);
-    setupTrustorePwdLine(lsMod, middle, margin, gSSLTrustStore, 
wbTrustStoreFile);
+    Button wbTrustStoreFile = setupTrustStoreFileLine(lsMod, middle, margin, 
gSSLTrustStore);
+    setupTrustStorePwdLine(lsMod, middle, margin, gSSLTrustStore, 
wbTrustStoreFile);
     setupIgnoreSslLine(middle, margin, gSSLTrustStore);
 
     FormData fdSSLTrustStore = new FormData();
@@ -440,7 +446,7 @@ public class RestDialog extends BaseTransformDialog {
     getData();
     activateUrlInfield();
     activateMethodInfield();
-    activateTrustoreFields();
+    activateTrustStoreFields();
     setMethod();
     input.setChanged(changed);
 
@@ -649,21 +655,26 @@ public class RestDialog extends BaseTransformDialog {
           @Override
           public void widgetSelected(SelectionEvent e) {
             input.setChanged();
-            activateTrustoreFields();
+            activateTrustStoreFields();
           }
         });
   }
 
-  private void activateTrustoreFields() {
+  private void activateTrustStoreFields() {
+    // trust store file(label/text/browse)
+    wlTrustStoreFile.setEnabled(!wIgnoreSsl.getSelection());
     wTrustStoreFile.setEnabled(!wIgnoreSsl.getSelection());
     wbTrustStoreFile.setEnabled(!wIgnoreSsl.getSelection());
+
+    // trust store password(label/text)
+    wlTrustStorePassword.setEnabled(!wIgnoreSsl.getSelection());
     wTrustStorePassword.setEnabled(!wIgnoreSsl.getSelection());
   }
 
-  private void setupTrustorePwdLine(
+  private void setupTrustStorePwdLine(
       ModifyListener lsMod, int middle, int margin, Group gSSLTrustStore, 
Button wbTrustStoreFile) {
     // TrustStorePassword line
-    Label wlTrustStorePassword = new Label(gSSLTrustStore, SWT.RIGHT);
+    wlTrustStorePassword = new Label(gSSLTrustStore, SWT.RIGHT);
     wlTrustStorePassword.setText(
         BaseMessages.getString(PKG, "RestDialog.TrustStorePassword.Label"));
     PropsUi.setLook(wlTrustStorePassword);
@@ -683,10 +694,10 @@ public class RestDialog extends BaseTransformDialog {
     wTrustStorePassword.setLayoutData(fdTrustStorePassword);
   }
 
-  private Button setupTrustoreFileLine(
+  private Button setupTrustStoreFileLine(
       ModifyListener lsMod, int middle, int margin, Group gSSLTrustStore) {
     // TrustStoreFile line
-    Label wlTrustStoreFile = new Label(gSSLTrustStore, SWT.RIGHT);
+    wlTrustStoreFile = new Label(gSSLTrustStore, SWT.RIGHT);
     wlTrustStoreFile.setText(BaseMessages.getString(PKG, 
"RestDialog.TrustStoreFile.Label"));
     PropsUi.setLook(wlTrustStoreFile);
     FormData fdlTrustStoreFile = new FormData();
@@ -1197,9 +1208,7 @@ public class RestDialog extends BaseTransformDialog {
         });
   }
 
-  private void setupRestConnectionLine(
-      ModifyListener lsMod, int middle, int margin, Composite wGeneralComp, 
Group gSettings) {
-
+  private void setupRestConnectionLine(int margin, Composite wGeneralComp, 
Group gSettings) {
     wSelectionLine =
         new MetaSelectionLine(
             variables,
@@ -1223,8 +1232,7 @@ public class RestDialog extends BaseTransformDialog {
     }
   }
 
-  private void setupUrlLine(
-      ModifyListener lsMod, int middle, int margin, Composite wGeneralComp, 
Group gSettings) {
+  private void setupUrlLine(ModifyListener lsMod, int middle, int margin, 
Group gSettings) {
 
     wlUrl = new Label(gSettings, SWT.RIGHT);
     wlUrl.setText(BaseMessages.getString(PKG, "RestDialog.URL.Label"));