Merge pull request #16497 from iterate-ch/bugfix/GH-16489

Revert default hostname configurator as no-op
iterate-ch · Nov 7, 2024 · d9de9fa · d9de9fa
2 parents 1656d8f + 8dc4c2e
commit d9de9fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java b/core/src/main/java/ch/cyberduck/core/AbstractProtocol.java
@@ -539,7 +539,7 @@ public <T> T getFeature(final Class<T> type) {
             return (T) new DefaultComparisonService(this);
         }
         if(type == HostnameConfigurator.class) {
-            return (T) new HostnameConfigurator.DefaultHostnameConfigurator(this);
+            return (T) HostnameConfigurator.DISABLED;
         }
         if(type == CredentialsConfigurator.class) {
             return (T) CredentialsConfigurator.DISABLED;

diff --git a/core/src/main/java/ch/cyberduck/core/HostnameConfigurator.java b/core/src/main/java/ch/cyberduck/core/HostnameConfigurator.java
@@ -19,8 +19,6 @@
  */
 
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * Configurator for resolving hostname from alias
  */
@@ -42,29 +40,20 @@ public interface HostnameConfigurator {
 
     HostnameConfigurator reload();
 
-    class DefaultHostnameConfigurator implements HostnameConfigurator {
-        private final AbstractProtocol protocol;
-
-        public DefaultHostnameConfigurator(final AbstractProtocol protocol) {
-            this.protocol = protocol;
-        }
-
+    HostnameConfigurator DISABLED = new HostnameConfigurator() {
         @Override
         public String getHostname(final String alias) {
-            if(StringUtils.isBlank(protocol.getDefaultHostname())) {
-                return alias;
-            }
-            return protocol.getDefaultHostname();
+            return alias;
         }
 
         @Override
         public int getPort(final String alias) {
-            return protocol.getDefaultPort();
+            return -1;
         }
 
         @Override
         public HostnameConfigurator reload() {
             return this;
         }
-    }
+    };
 }
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BookmarkController.java
@@ -251,7 +251,6 @@ public void hostFieldDidChange(final NSNotification sender) {
         }
         else {
             bookmark.setHostname(input);
-            bookmark.setPort(HostnameConfiguratorFactory.get(bookmark.getProtocol()).getPort(input));
             bookmark.setCredentials(CredentialsConfiguratorFactory.get(bookmark.getProtocol()).configure(bookmark));
         }
         this.update();

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/controller/BookmarkController.cs b/windows/src/main/csharp/ch/cyberduck/ui/controller/BookmarkController.cs
@@ -217,7 +217,6 @@ internal void View_ChangedServerEvent()
             else
             {
                 _host.setHostname(input);
-                _host.setPort(HostnameConfiguratorFactory.get(_host.getProtocol()).getPort(input));
                 _host.setCredentials(CredentialsConfiguratorFactory.get(_host.getProtocol()).configure(_host));
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -217,7 +217,6 @@ internal void View_ChangedServerEvent() @@
                 else
                 {
                     _host.setHostname(input);
-                    _host.setPort(HostnameConfiguratorFactory.get(_host.getProtocol()).getPort(input));
                     _host.setCredentials(CredentialsConfiguratorFactory.get(_host.getProtocol()).configure(_host));
                 }
@@ Expand Down @@