fix #2952 Unwanted "Invalid connection" message on not existing conne…

…ctions
apache · May 22, 2023 · 0338bf6 · 0338bf6
1 parent ed28e43
commit 0338bf6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 40 deletions.
diff --git a/...ansforms/delete/src/main/java/org/apache/hop/pipeline/transforms/delete/DeleteDialog.java b/...ansforms/delete/src/main/java/org/apache/hop/pipeline/transforms/delete/DeleteDialog.java
@@ -484,17 +484,15 @@ private void ok() {
       return;
     }
 
-    // Get the information for the dialog into the input structure.
-    getInfo(input);
-
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
+    if (input.getConnection() == null) {
       MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
       mb.setMessage(BaseMessages.getString(PKG, "DeleteDialog.InvalidConnection.DialogMessage"));
       mb.setText(BaseMessages.getString(PKG, "DeleteDialog.InvalidConnection.DialogTitle"));
       mb.open();
       return;
     }
+    // Get the information for the dialog into the input structure.
+    getInfo(input);
 
     dispose();
   }

diff --git a/...csqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java b/...csqlrow/src/main/java/org/apache/hop/pipeline/transforms/execsqlrow/ExecSqlRowDialog.java
@@ -391,6 +391,16 @@ private void ok() {
     if (Utils.isEmpty(wTransformName.getText())) {
       return;
     }
+
+    if (input.getConnection() == null) {
+      MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
+      mb.setMessage(
+              BaseMessages.getString(PKG, "ExecSqlRowDialog.InvalidConnection.DialogMessage"));
+      mb.setText(BaseMessages.getString(PKG, "ExecSqlRowDialog.InvalidConnection.DialogTitle"));
+      mb.open();
+      return;
+    }
+
     input.setCommitSize(Const.toInt(wCommit.getText(), 0));
     transformName = wTransformName.getText(); // return value
     input.setSqlFieldName(wSqlFieldName.getText());
@@ -404,16 +414,6 @@ private void ok() {
     input.setSqlFromfile(wSqlFromFile.getSelection());
     input.setSendOneStatement(wSendOneStatement.getSelection());
 
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
-      MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
-      mb.setMessage(
-          BaseMessages.getString(PKG, "ExecSqlRowDialog.InvalidConnection.DialogMessage"));
-      mb.setText(BaseMessages.getString(PKG, "ExecSqlRowDialog.InvalidConnection.DialogTitle"));
-      mb.open();
-      return;
-    }
-
     dispose();
   }
 

diff --git a/...ate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateDialog.java b/...ate/src/main/java/org/apache/hop/pipeline/transforms/insertupdate/InsertUpdateDialog.java
@@ -768,18 +768,16 @@ private void ok() {
       return;
     }
 
-    // Get the information for the dialog into the input structure.
-    getInfo(input);
-
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
+    if (Utils.isEmpty(input.getConnection())) {
       MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
       mb.setMessage(
           BaseMessages.getString(PKG, "InsertUpdateDialog.InvalidConnection.DialogMessage"));
       mb.setText(BaseMessages.getString(PKG, "InsertUpdateDialog.InvalidConnection.DialogTitle"));
       mb.open();
     }
 
+    // Get the information for the dialog into the input structure.
+    getInfo(input);
     dispose();
   }
 

diff --git a/...xists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java b/...xists/src/main/java/org/apache/hop/pipeline/transforms/tableexists/TableExistsDialog.java
@@ -259,22 +259,21 @@ private void ok() {
       return;
     }
 
+    if (input.getConnection() == null) {
+      MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
+      mb.setMessage(
+              BaseMessages.getString(PKG, "TableExistsDialog.InvalidConnection.DialogMessage"));
+      mb.setText(BaseMessages.getString(PKG, "TableExistsDialog.InvalidConnection.DialogTitle"));
+      mb.open();
+    }
+
     input.setConnection(wConnection.getText());
     input.setSchemaName(wSchemaname.getText());
     input.setTableNameField(wTableName.getText());
     input.setResultFieldName(wResult.getText());
 
     transformName = wTransformName.getText(); // return value
 
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
-      MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
-      mb.setMessage(
-          BaseMessages.getString(PKG, "TableExistsDialog.InvalidConnection.DialogMessage"));
-      mb.setText(BaseMessages.getString(PKG, "TableExistsDialog.InvalidConnection.DialogTitle"));
-      mb.open();
-    }
-
     dispose();
   }
 

diff --git a/...leinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java b/...leinput/src/main/java/org/apache/hop/pipeline/transforms/tableinput/TableInputDialog.java
@@ -405,19 +405,15 @@ private void ok() {
     }
 
     transformName = wTransformName.getText(); // return value
-    // copy info to TextFileInputMeta class (input)
-
-    getInfo(input, false);
-
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
+    if (Utils.isEmpty(input.getConnection())) {
       MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
       mb.setMessage(BaseMessages.getString(PKG, "TableInputDialog.SelectValidConnection"));
       mb.setText(BaseMessages.getString(PKG, "TableInputDialog.DialogCaptionError"));
       mb.open();
       return;
     }
 
+    getInfo(input, false);
     dispose();
   }
 

diff --git a/...ansforms/update/src/main/java/org/apache/hop/pipeline/transforms/update/UpdateDialog.java b/...ansforms/update/src/main/java/org/apache/hop/pipeline/transforms/update/UpdateDialog.java
@@ -736,18 +736,16 @@ private void ok() {
       return;
     }
 
-    // Get the information for the dialog into the input structure.
-    getInfo(input);
-
-    DatabaseMeta databaseMeta = pipelineMeta.findDatabase(input.getConnection(), variables);
-    if (databaseMeta == null) {
+    if (Utils.isEmpty(input.getConnection())) {
       MessageBox mb = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
       mb.setMessage(BaseMessages.getString(PKG, "UpdateDialog.InvalidConnection.DialogMessage"));
       mb.setText(BaseMessages.getString(PKG, "UpdateDialog.InvalidConnection.DialogTitle"));
       mb.open();
       return;
     }
 
+    // Get the information for the dialog into the input structure.
+    getInfo(input);
     dispose();
   }