To squash

Signed-off-by: Rossen Stoyanchev <rstoyanchev@vmware.com>
rsocket · Sep 10, 2020 · 0002d67 · 0002d67
1 parent 36f478c
commit 0002d67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/rsocket-core/src/test/java/io/rsocket/test/util/LocalDuplexConnection.java b/rsocket-core/src/test/java/io/rsocket/test/util/LocalDuplexConnection.java
@@ -96,7 +96,7 @@ public ByteBufAllocator alloc() {
 
   @Override
   public SocketAddress remoteAddress() {
-    return new LocalSocketAddress(name);
+    return new TestLocalSocketAddress(name);
   }
 
   @Override

diff --git a/rsocket-core/src/test/java/io/rsocket/test/util/TestDuplexConnection.java b/rsocket-core/src/test/java/io/rsocket/test/util/TestDuplexConnection.java
@@ -114,7 +114,7 @@ public ByteBufAllocator alloc() {
 
   @Override
   public SocketAddress remoteAddress() {
-    return new LocalSocketAddress("TestDuplexConnection");
+    return new TestLocalSocketAddress("TestDuplexConnection");
   }
 
   @Override

diff --git a/...rsocket/test/util/LocalSocketAddress.java → ...ket/test/util/TestLocalSocketAddress.java b/...rsocket/test/util/LocalSocketAddress.java → ...ket/test/util/TestLocalSocketAddress.java
@@ -18,7 +18,7 @@
 import java.net.SocketAddress;
 import java.util.Objects;
 
-public final class LocalSocketAddress extends SocketAddress {
+public final class TestLocalSocketAddress extends SocketAddress {
 
   private static final long serialVersionUID = 2608695156052100164L;
 
@@ -30,7 +30,7 @@ public final class LocalSocketAddress extends SocketAddress {
    * @param name the name representing the address
    * @throws NullPointerException if {@code name} is {@code null}
    */
-  public LocalSocketAddress(String name) {
+  public TestLocalSocketAddress(String name) {
     this.name = Objects.requireNonNull(name, "name must not be null");
   }