More renaming

zeroc-ice · Jun 26, 2024 · 0673c9e · 0673c9e
1 parent ebc6a9b
commit 0673c9e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ConnectionI.java
@@ -336,7 +336,7 @@ public synchronized void setCloseCallback(final CloseCallback callback) {
     if (_state >= StateClosed) {
       if (callback != null) {
         _threadPool.dispatch(
-            new com.zeroc.IceInternal.DispatchWorkItem(this) {
+            new com.zeroc.IceInternal.RunnableThreadPoolWorkItem(this) {
               @Override
               public void run() {
                 try {
@@ -830,7 +830,7 @@ public void message(com.zeroc.IceInternal.ThreadPoolCurrent current) {
       final java.util.List<OutgoingMessage> finalSentCBs = sentCBs;
       final MessageInfo finalInfo = info;
       _threadPool.executeFromThisThread(
-          new com.zeroc.IceInternal.DispatchWorkItem(this) {
+          new com.zeroc.IceInternal.RunnableThreadPoolWorkItem(this) {
             @Override
             public void run() {
               upcall(finalStartCB, finalSentCBs, finalInfo);
@@ -992,7 +992,7 @@ public Void call() throws Exception {
       finish(close);
     } else {
       _threadPool.executeFromThisThread(
-          new com.zeroc.IceInternal.DispatchWorkItem(this) {
+          new com.zeroc.IceInternal.RunnableThreadPoolWorkItem(this) {
             @Override
             public void run() {
               finish(close);

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/CollocatedRequestHandler.java
@@ -14,7 +14,7 @@
 import java.util.concurrent.CompletionStage;
 
 public class CollocatedRequestHandler implements RequestHandler {
-  private class InvokeAllAsync extends DispatchWorkItem {
+  private class InvokeAllAsync extends RunnableThreadPoolWorkItem {
     private InvokeAllAsync(
         OutgoingAsyncBase outAsync,
         com.zeroc.Ice.OutputStream os,

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
@@ -206,7 +206,7 @@ public final void invokeCompletedAsync() {
     _instance
         .clientThreadPool()
         .dispatch(
-            new DispatchWorkItem(_cachedConnection) {
+            new RunnableThreadPoolWorkItem(_cachedConnection) {
               @Override
               public void run() {
                 invokeCompleted();
@@ -363,7 +363,7 @@ protected void dispatch(final Runnable runnable) {
       _instance
           .clientThreadPool()
           .dispatch(
-              new DispatchWorkItem(_cachedConnection) {
+              new RunnableThreadPoolWorkItem(_cachedConnection) {
                 @Override
                 public void run() {
                   runnable.run();

diff --git a/...m/zeroc/IceInternal/DispatchWorkItem.java → ...eInternal/RunnableThreadPoolWorkItem.java b/...m/zeroc/IceInternal/DispatchWorkItem.java → ...eInternal/RunnableThreadPoolWorkItem.java
@@ -10,10 +10,10 @@
 // thread pool work item is executed with the executor, otherwise it's
 // executed by a thread pool thread (after promoting a follower thread).
 //
-public abstract class DispatchWorkItem implements ThreadPoolWorkItem, Runnable {
-  public DispatchWorkItem() {}
+public abstract class RunnableThreadPoolWorkItem implements ThreadPoolWorkItem, Runnable {
+  public RunnableThreadPoolWorkItem() {}
 
-  public DispatchWorkItem(com.zeroc.Ice.Connection connection) {
+  public RunnableThreadPoolWorkItem(com.zeroc.Ice.Connection connection) {
     _connection = connection;
   }
 

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
@@ -266,7 +266,7 @@ public synchronized boolean finish(EventHandler handler, boolean closeNow) {
     return closeNow;
   }
 
-  public void executeFromThisThread(DispatchWorkItem workItem) {
+  public void executeFromThisThread(RunnableThreadPoolWorkItem workItem) {
     if (_executor != null) {
       try {
         _executor.accept(workItem, workItem.getConnection());
@@ -285,7 +285,7 @@ public void executeFromThisThread(DispatchWorkItem workItem) {
     }
   }
 
-  public synchronized void dispatch(DispatchWorkItem workItem) {
+  public synchronized void dispatch(RunnableThreadPoolWorkItem workItem) {
     if (_destroyed) {
       throw new com.zeroc.Ice.CommunicatorDestroyedException();
     }
@@ -315,7 +315,7 @@ public void joinWithAllThreads() throws InterruptedException {
   @Override
   public void execute(Runnable command) {
     dispatch(
-        new com.zeroc.IceInternal.DispatchWorkItem() {
+        new com.zeroc.IceInternal.RunnableThreadPoolWorkItem() {
           @Override
           public void run() {
             command.run();

diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPoolCurrent.java
@@ -28,7 +28,7 @@ public void ioCompleted() {
     _threadPool.ioCompleted(this);
   }
 
-  public void executeFromThisThread(DispatchWorkItem workItem) {
+  public void executeFromThisThread(RunnableThreadPoolWorkItem workItem) {
     _threadPool.executeFromThisThread(workItem);
   }