HANA connection dialog: convert GENERIC + host=<host>:443 to CLOUD (dbeaver#35045) (dbeaver#35046)

kai-morich · MashaKorax · web-flow · commit a426bdbb077e · 2024-09-12T08:45:44.000+02:00
* HANA connection dialog: convert GENERIC + host=<host>:443 to CLOUD (dbeaver#35045) * extracted HTTPS_PORT_SUFFIX constant --------- Co-authored-by: MashaKorax <84867187+MashaKorax@users.noreply.github.com>
diff --git a/plugins/org.jkiss.dbeaver.ext.hana.ui/src/org/jkiss/dbeaver/ext/hana/ui/views/HANAConnectionPage.java b/plugins/org.jkiss.dbeaver.ext.hana.ui/src/org/jkiss/dbeaver/ext/hana/ui/views/HANAConnectionPage.java
@@ -24,6 +24,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
+import org.jkiss.dbeaver.ext.hana.model.HANAConstants;
 import org.jkiss.dbeaver.ext.hana.ui.internal.HANAEdition;
 import org.jkiss.dbeaver.ext.hana.ui.internal.HANAMessages;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
@@ -120,7 +121,7 @@ public void createControl(Composite composite) {
         editionCombo.addSelectionListener(new SelectionAdapter() {
             @Override public void widgetSelected(SelectionEvent e) { editionUpdated(); site.updateButtons(); }
         });
-        hostText.addModifyListener(e -> site.updateButtons());
+        hostText.addModifyListener(e -> { hostUpdated(); site.updateButtons(); });
         portText.addModifyListener(e -> site.updateButtons());
         instanceText.addModifyListener(e -> { instanceUpdated(); site.updateButtons(); });
         databaseText.addModifyListener(e -> site.updateButtons());
@@ -182,7 +183,7 @@ public void loadSettings() {
         super.loadSettings();
         DBPConnectionConfiguration connectionInfo = site.getActiveDataSource().getConnectionConfiguration();
         edition = HANAEdition.fromName(connectionInfo.getProviderProperty(PROV_PROP_EDITION));
-        portValue = CommonUtils.toString(connectionInfo.getHostPort(), site.getDriver().getDefaultPort());
+        portValue = CommonUtils.toString(connectionInfo.getHostPort()/*, site.getDriver().getDefaultPort()*/);
         instanceValue = CommonUtils.notEmpty(connectionInfo.getProviderProperty(PROV_PROP_INSTANCE_NUMBER));
         databaseValue = CommonUtils.notEmpty(getProperty(connectionInfo, PROP_DATABASE_NAME));
         if (created) {
@@ -290,21 +291,34 @@ private void editionUpdated() {
         }
         UIUtils.fixReadonlyTextBackground(databaseText);
 
-        toggleControlVisibility(instanceLabel);
-        toggleControlVisibility(instanceText);
-        toggleControlVisibility(databaseLabel);
-        toggleControlVisibility(databaseText);
+        boolean visible = edition != HANAEdition.GENERIC && edition != HANAEdition.CLOUD;
+        toggleControlVisibility(instanceLabel, visible);
+        toggleControlVisibility(instanceText, visible);
+        toggleControlVisibility(databaseLabel, visible);
+        toggleControlVisibility(databaseText, visible);
         ((Composite)getControl()).layout(true, true);
     }
 
-    private void toggleControlVisibility(Control control) {
-        control.setVisible(edition != HANAEdition.GENERIC);
+    private void toggleControlVisibility(Control control, boolean visible) {
+        control.setVisible(visible);
         Object layoutData = control.getLayoutData();
         if (layoutData instanceof GridData) {
-            ((GridData) layoutData).exclude = (edition == HANAEdition.GENERIC);
+            ((GridData) layoutData).exclude = !visible;
         }
     }
 
+    private void hostUpdated() {
+        if (CommonUtils.isEmpty(hostText.getText())) {
+            return;
+        }
+        String host = hostText.getText().trim();
+        if (edition == HANAEdition.GENERIC && CommonUtils.isEmpty(portText.getText()) && host.endsWith(HANAConstants.HTTPS_PORT_SUFFIX)) {
+            hostText.setText(host.substring(0, host.length() - HANAConstants.HTTPS_PORT_SUFFIX.length()));
+            editionCombo.select(editionCombo.indexOf(HANAEdition.CLOUD.getTitle()));
+            editionUpdated();
+        }
+    }
+    
     private void instanceUpdated() {
         if (CommonUtils.isEmpty(instanceText.getText())) {
             return;
diff --git a/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAConstants.java b/plugins/org.jkiss.dbeaver.ext.hana/src/org/jkiss/dbeaver/ext/hana/model/HANAConstants.java
@@ -18,6 +18,9 @@
 
 public class HANAConstants {
 
+    // HANA cloud connections use regular HTTPS port
+    public static final String HTTPS_PORT_SUFFIX = ":443";
+    
 	// boolean like columns in SYS schema are stored as VARCHAR(5) with values TRUE, FALSE
     public static final String SYS_BOOLEAN_TRUE = "TRUE";
     public static final String SYS_BOOLEAN_FALSE = "FALSE";
