Plugin API - deprecate methods returning optional RPC host/port

CHANGELOG.md

@@ -28,6 +28,8 @@
   - Smart-contract-based (onchain) permissioning
   - Proof of Work consensus
   - Fast Sync
+- Plugins 
+  - `BesuConfiguration` methods `getRpcHttpHost` and `getRpcHttpPort` (which return Optionals) have been deprecated in favour of `getConfiguredRpcHttpHost` and `getConfiguredRpcHttpPort` which return the actual values, which will always be populated since these options have defaults. [#8127](https://github.com/hyperledger/besu/pull/8127) 
 
 ### Additions and Improvements
 - Add RPC HTTP options to specify custom truststore and its password [#7978](https://github.com/hyperledger/besu/pull/7978)

besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java

@@ -32,8 +32,8 @@ public class BesuConfigurationImpl implements BesuConfiguration {
 
   // defaults
   private MiningConfiguration miningConfiguration;
-  private Optional<String> rpcHttpHost = Optional.of("http://localhost");
-  private Optional<Integer> rpcHttpPort = Optional.of(8545);
+  private String rpcHttpHost = "http://localhost";
+  private Integer rpcHttpPort = 8545;
 
   /** Default Constructor. */
   public BesuConfigurationImpl() {}
@@ -74,18 +74,30 @@ public BesuConfigurationImpl withMiningParameters(final MiningConfiguration mini
    * @return BesuConfigurationImpl instance
    */
   public BesuConfigurationImpl withJsonRpcHttpOptions(final JsonRpcHttpOptions rpcHttpOptions) {
-    this.rpcHttpHost = Optional.ofNullable(rpcHttpOptions.getRpcHttpHost());
-    this.rpcHttpPort = Optional.ofNullable(rpcHttpOptions.getRpcHttpPort());
+    this.rpcHttpHost = rpcHttpOptions.getRpcHttpHost();
+    this.rpcHttpPort = rpcHttpOptions.getRpcHttpPort();
     return this;
   }
 
+  @Deprecated
   @Override
   public Optional<String> getRpcHttpHost() {
-    return rpcHttpHost;
+    return Optional.of(rpcHttpHost);
   }
 
+  @Deprecated
   @Override
   public Optional<Integer> getRpcHttpPort() {
+    return Optional.of(rpcHttpPort);
+  }
+
+  @Override
+  public String getConfiguredRpcHttpHost() {
+    return rpcHttpHost;
+  }
+
+  @Override
+  public Integer getConfiguredRpcHttpPort() {
     return rpcHttpPort;
   }
 

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/AbstractIsolationTests.java

@@ -217,6 +217,16 @@ public Optional<Integer> getRpcHttpPort() {
                 return Optional.empty();
               }
 
+              @Override
+              public String getConfiguredRpcHttpHost() {
+                return "";
+              }
+
+              @Override
+              public Integer getConfiguredRpcHttpPort() {
+                return 0;
+              }
+
               @Override
               public Path getStoragePath() {
                 return tempData.resolve("database");

plugin-api/build.gradle

@@ -71,7 +71,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'E2b/W+IKnNxo6L7cHuijBMBUewHHRrkQ8dEVlcql5KE='
+  knownHash = 'V1dUr46JD2WQNMgrl2KqCeCro0y1MI03xT7/go9toj0='
 }
 check.dependsOn('checkAPIChanges')
 

plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java

@@ -30,15 +30,31 @@ public interface BesuConfiguration extends BesuService {
    *
    * @return the configured RPC http host.
    */
+  @Deprecated(since = "25.1.0")
   Optional<String> getRpcHttpHost();
 
   /**
    * Get the configured RPC http port.
    *
    * @return the configured RPC http port.
    */
+  @Deprecated(since = "25.1.0")
   Optional<Integer> getRpcHttpPort();
 
+  /**
+   * Get the configured RPC http host.
+   *
+   * @return the configured RPC http host.
+   */
+  String getConfiguredRpcHttpHost();
+
+  /**
+   * Get the configured RPC http port.
+   *
+   * @return the configured RPC http port.
+   */
+  Integer getConfiguredRpcHttpPort();
+
   /**
    * Location of the working directory of the storage in the file system running the client.
    *