commit 88ee2e643d5e3dc16780e8ee8b1893188d94b88e
author Wyatt Hepler <hepler@google.com> Thu Jun 09 14:37:42 2022 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jun 10 22:05:49 2022 +0000
tree 40d433b8e3c18bdb0689ea029ee390d85e0b2b57
parent 2c81a8331d07a842eb859a409edf0bcc605a3cf7

pw_rpc: Make service/method ID private in the Java APIs

Service and method IDs are internal to pw_rpc and should not be used
externally.

Change-Id: Ia286bb9bc4b23205c84ed3d82c52132d49d7e9c3
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/97681
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Commit-Queue: Wyatt Hepler <hepler@google.com>

pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java

diff --git a/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java b/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java
index 95be4cf..f1383ff 100644
--- a/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java
+++ b/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java
@@ -134,12 +134,12 @@
       return method(channelId, serviceMethod.service().id(), serviceMethod.id());
     } catch (IllegalArgumentException e) {
       // Rethrow the exception with the service and method name instead of the ID.
-      throw new IllegalArgumentException("Unknown RPC " + serviceMethod.fullName());
+      throw new IllegalArgumentException("Unknown RPC " + serviceMethod.fullName(), e);
     }
   }
 
   /** Returns a MethodClient with the provided service and method IDs. */
-  public synchronized MethodClient method(int channelId, int serviceId, int methodId) {
+  synchronized MethodClient method(int channelId, int serviceId, int methodId) {
     Channel channel = channels.get(channelId);
     if (channel == null) {
       throw new IllegalArgumentException("Unknown channel ID " + channelId);

pw_rpc/java/main/dev/pigweed/pw_rpc/Method.java

diff --git a/pw_rpc/java/main/dev/pigweed/pw_rpc/Method.java b/pw_rpc/java/main/dev/pigweed/pw_rpc/Method.java
index e32d955..ff80cbb 100644
--- a/pw_rpc/java/main/dev/pigweed/pw_rpc/Method.java
+++ b/pw_rpc/java/main/dev/pigweed/pw_rpc/Method.java
@@ -41,7 +41,7 @@
 
   public abstract Class<? extends MessageLite> response();
 
-  public final int id() {
+  final int id() {
     return Ids.calculate(name());
   }
 

pw_rpc/java/main/dev/pigweed/pw_rpc/Service.java

diff --git a/pw_rpc/java/main/dev/pigweed/pw_rpc/Service.java b/pw_rpc/java/main/dev/pigweed/pw_rpc/Service.java
index 311ff6f..eeffd2a 100644
--- a/pw_rpc/java/main/dev/pigweed/pw_rpc/Service.java
+++ b/pw_rpc/java/main/dev/pigweed/pw_rpc/Service.java
@@ -38,7 +38,7 @@
     return name;
   }
 
-  public int id() {
+  int id() {
     return id;
   }