Rename classes s/UDS/Uds/

Author: ejona86

android-interop-testing/src/androidTest/java/io/grpc/android/integrationtest/UdsChannelInteropTest.java

@@ -25,7 +25,7 @@
 import androidx.test.runner.AndroidJUnit4;
 import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.Server;
-import io.grpc.android.UDSChannelBuilder;
+import io.grpc.android.UdsChannelBuilder;
 import io.grpc.android.integrationtest.InteropTask.Listener;
 import io.grpc.netty.NettyServerBuilder;
 import io.grpc.testing.integration.TestServiceImpl;
@@ -39,7 +39,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * Tests for channels created with {@link UDSChannelBuilder}. The UDS Channel is only meant to talk
+ * Tests for channels created with {@link UdsChannelBuilder}. The UDS Channel is only meant to talk
  * to Unix Domain Socket endpoints on servers that are on-device, so a {@link LocalTestServer} is
  * set up to expose a UDS endpoint.
  */
@@ -123,7 +123,7 @@ public void onComplete(String result) {
 
     new InteropTask(
             listener,
-            UDSChannelBuilder.forPath(UDS_PATH, Namespace.ABSTRACT)
+            UdsChannelBuilder.forPath(UDS_PATH, Namespace.ABSTRACT)
                 .maxInboundMessageSize(16 * 1024 * 1024)
                 .build(),
             testCase)

android-interop-testing/src/main/java/io/grpc/android/integrationtest/TesterActivity.java

@@ -31,7 +31,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.security.ProviderInstaller;
 import io.grpc.ManagedChannel;
-import io.grpc.android.UDSChannelBuilder;
+import io.grpc.android.UdsChannelBuilder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -146,7 +146,7 @@ private void startTest(String testCase) {
     // Create Channel
     ManagedChannel channel;
     if (udsEnabled) {
-      channel = UDSChannelBuilder.forPath(udsPath, Namespace.ABSTRACT).build();
+      channel = UdsChannelBuilder.forPath(udsPath, Namespace.ABSTRACT).build();
     } else {
       channel = TesterOkHttpChannelBuilder.build(host, port, serverHostOverride, true, testCert);
     }

…a/io/grpc/android/UDSChannelBuilder.java …a/io/grpc/android/UdsChannelBuilder.javaandroid/src/main/java/io/grpc/android/UDSChannelBuilder.java renamed to android/src/main/java/io/grpc/android/UdsChannelBuilder.java android/src/main/java/io/grpc/android/UDSChannelBuilder.java renamed to android/src/main/java/io/grpc/android/UdsChannelBuilder.java

@@ -27,10 +27,10 @@
 
 /**
  * Creates a UDS channel by passing in a specialized SocketFactory into an OkHttpChannelBuilder. The
- * UDSSockets produced by this factory communicate over Android's LocalSockets.
+ * UdsSockets produced by this factory communicate over Android's LocalSockets.
  *
  * <p>Example Usage <code>
- *   Channel channel = UDSChannelBuilder.forPath("/data/data/my.app/app.socket",
+ *   Channel channel = UdsChannelBuilder.forPath("/data/data/my.app/app.socket",
  *     Namespace.FILESYSTEM).build();
  *   stub = MyService.newStub(channel);
  * </code>
@@ -41,7 +41,7 @@
  * a `unix:` name resolver when possible.
  */
 @ExperimentalApi("A stopgap. Not intended to be stabilized")
-public final class UDSChannelBuilder {
+public final class UdsChannelBuilder {
   @Nullable
   @SuppressWarnings("rawtypes")
   private static final Class<? extends ManagedChannelBuilder> OKHTTP_CHANNEL_BUILDER_CLASS =
@@ -77,7 +77,7 @@ public static ManagedChannelBuilder<?> forPath(String path, Namespace namespace)
       ManagedChannelBuilder<?> builder = OKHTTP_CHANNEL_BUILDER_CLASS.cast(o);
       OKHTTP_CHANNEL_BUILDER_CLASS
           .getMethod("socketFactory", SocketFactory.class)
-          .invoke(builder, new UDSSocketFactory(path, namespace));
+          .invoke(builder, new UdsSocketFactory(path, namespace));
       return builder;
     } catch (IllegalAccessException e) {
       throw new RuntimeException("Failed to create OkHttpChannelBuilder", e);
@@ -88,5 +88,5 @@ public static ManagedChannelBuilder<?> forPath(String path, Namespace namespace)
     }
   }
 
-  private UDSChannelBuilder() {}
+  private UdsChannelBuilder() {}
 }

…main/java/io/grpc/android/UDSSocket.java …main/java/io/grpc/android/UdsSocket.javaandroid/src/main/java/io/grpc/android/UDSSocket.java renamed to android/src/main/java/io/grpc/android/UdsSocket.java android/src/main/java/io/grpc/android/UDSSocket.java renamed to android/src/main/java/io/grpc/android/UdsSocket.java

@@ -31,7 +31,7 @@
 import java.nio.channels.SocketChannel;
 
 @SuppressWarnings("UnsynchronizedOverridesSynchronized") // Rely on LocalSocket's synchronization
-class UDSSocket extends Socket {
+class UdsSocket extends Socket {
 
   private final LocalSocket localSocket;
   private final LocalSocketAddress localSocketAddress;
@@ -45,7 +45,7 @@ class UDSSocket extends Socket {
   @GuardedBy("this")
   private boolean outputShutdown = false;
 
-  public UDSSocket(LocalSocketAddress localSocketAddress) {
+  public UdsSocket(LocalSocketAddress localSocketAddress) {
     this.localSocketAddress = localSocketAddress;
     localSocket = new LocalSocket();
   }
@@ -95,7 +95,7 @@ public InputStream getInputStream() throws IOException {
     return new FilterInputStream(localSocket.getInputStream()) {
       @Override
       public void close() throws IOException {
-        UDSSocket.this.close();
+        UdsSocket.this.close();
       }
     };
   }
@@ -130,7 +130,7 @@ public OutputStream getOutputStream() throws IOException {
     return new FilterOutputStream(localSocket.getOutputStream()) {
       @Override
       public void close() throws IOException {
-        UDSSocket.this.close();
+        UdsSocket.this.close();
       }
     };
   }

…va/io/grpc/android/UDSSocketFactory.java …va/io/grpc/android/UdsSocketFactory.javaandroid/src/main/java/io/grpc/android/UDSSocketFactory.java renamed to android/src/main/java/io/grpc/android/UdsSocketFactory.java android/src/main/java/io/grpc/android/UDSSocketFactory.java renamed to android/src/main/java/io/grpc/android/UdsSocketFactory.java

@@ -26,14 +26,14 @@
 import javax.net.SocketFactory;
 
 /**
- * A SocketFactory that produces {@link UDSSocket} instances. This is used to provide support for
+ * A SocketFactory that produces {@link UdsSocket} instances. This is used to provide support for
  * gRPC channels with an underlying Unix Domain Socket transport.
  */
-class UDSSocketFactory extends SocketFactory {
+class UdsSocketFactory extends SocketFactory {
 
   private final LocalSocketAddress localSocketAddress;
 
-  public UDSSocketFactory(String path, Namespace namespace) {
+  public UdsSocketFactory(String path, Namespace namespace) {
     localSocketAddress = new LocalSocketAddress(path, namespace);
   }
 
@@ -65,7 +65,7 @@ public Socket createSocket(InetAddress address, int port, InetAddress localAddre
   }
 
   private Socket create() {
-    return new UDSSocket(localSocketAddress);
+    return new UdsSocket(localSocketAddress);
   }
 
   private Socket createAndConnect() throws IOException {