From ab81ab21ab9506cbbf62297ffba405e6204d09dd Mon Sep 17 00:00:00 2001
From: Mark Rotteveel <mark@lawinegevaar.nl>
Date: Fri, 27 Dec 2024 15:58:50 +0100
Subject: [PATCH] Removed deprecated for removal methods from ServiceManager

---
 src/docs/asciidoc/release_notes.adoc          |  5 +++
 .../management/FBServiceManager.java          | 28 -------------
 .../management/ServiceManager.java            | 42 -------------------
 3 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/src/docs/asciidoc/release_notes.adoc b/src/docs/asciidoc/release_notes.adoc
index 8b0dccc81..82c4f1bee 100644
--- a/src/docs/asciidoc/release_notes.adoc
+++ b/src/docs/asciidoc/release_notes.adoc
@@ -492,6 +492,11 @@ use `DIALECT_3`
 * `SQLStateConstants`
 ** `SQL_STATE_CONNECTION_CLOSED` (`08003`);
 use `SQL_STATE_CONNECTION_FAILURE` (`08006`).
+* `ServiceManager`
+** `getHost`/`setHost`;
+use `getServerName`/`setServerName`
+** `getPort`/`setPort`;
+use `getPortNumber`/`setPortNumber`
 
 [#breaking-changes-internal-api]
 === Breaking changes internal API
diff --git a/src/main/org/firebirdsql/management/FBServiceManager.java b/src/main/org/firebirdsql/management/FBServiceManager.java
index fbb340845..89ccfd226 100644
--- a/src/main/org/firebirdsql/management/FBServiceManager.java
+++ b/src/main/org/firebirdsql/management/FBServiceManager.java
@@ -183,34 +183,6 @@ public String getDatabase() {
         return database;
     }
 
-    @SuppressWarnings("removal")
-    @Override
-    @Deprecated(since = "5", forRemoval = true)
-    public String getHost() {
-        return getServerName();
-    }
-
-    @SuppressWarnings("removal")
-    @Override
-    @Deprecated(since = "5", forRemoval = true)
-    public void setHost(String host) {
-        setServerName(host);
-    }
-
-    @SuppressWarnings("removal")
-    @Override
-    @Deprecated(since = "5", forRemoval = true)
-    public int getPort() {
-        return getPortNumber();
-    }
-
-    @SuppressWarnings("removal")
-    @Override
-    @Deprecated(since = "5", forRemoval = true)
-    public void setPort(int port) {
-        setPortNumber(port);
-    }
-
     @Override
     public String getWireCrypt() {
         return ServiceManager.super.getWireCrypt();
diff --git a/src/main/org/firebirdsql/management/ServiceManager.java b/src/main/org/firebirdsql/management/ServiceManager.java
index a9e01d722..325378e4f 100644
--- a/src/main/org/firebirdsql/management/ServiceManager.java
+++ b/src/main/org/firebirdsql/management/ServiceManager.java
@@ -26,7 +26,6 @@
 
 import org.firebirdsql.gds.impl.GDSServerVersion;
 import org.firebirdsql.gds.ng.WireCrypt;
-import org.firebirdsql.jaybird.props.AttachmentProperties;
 import org.firebirdsql.jaybird.props.ServiceConnectionProperties;
 
 import java.io.OutputStream;
@@ -60,47 +59,6 @@ public interface ServiceManager extends ServiceConnectionProperties {
      */
     String getDatabase();
 
-    /**
-     * Returns the host for the connection to the service manager.
-     *
-     * @return the host for the connection to the service manager.
-     * @deprecated Use {@link #getServerName()}; will be removed in Jaybird 6 or later
-     */
-    @Deprecated(since = "5", forRemoval = true)
-    String getHost();
-
-    /**
-     * Sets the host for the connection to the service manager.
-     * <p>
-     * See {@link AttachmentProperties#setServerName(String)} for details.
-     * </p>
-     *
-     * @param host
-     *         for the connection to the service manager.
-     * @deprecated Use {@link #setServerName(String)}; will be removed in Jaybird 6 or later
-     */
-    @Deprecated(since = "5", forRemoval = true)
-    void setHost(String host);
-
-    /**
-     * Returns the port for the connection to the service manager.
-     *
-     * @return the port for the connection to the service manager.
-     * @deprecated Use {@link #getPortNumber()}; will be removed in Jaybird 6 or later
-     */
-    @Deprecated(since = "5", forRemoval = true)
-    int getPort();
-
-    /**
-     * Sets the port for the connection to the service manager.
-     *
-     * @param port
-     *         for the connection to the service manager.
-     * @deprecated Use {@link #setPortNumber(int)}; will be removed in Jaybird 6 or later
-     */
-    @Deprecated(since = "5", forRemoval = true)
-    void setPort(int port);
-
     /**
      * Get the wire encryption level.
      *