diff options
author | Ted Pudlik <tpudlik@google.com> | 2022-03-30 22:23:53 +0000 |
---|---|---|
committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-03-30 23:40:40 +0000 |
commit | ba414d66e44e6932c34d90210cb691a47b79a2c8 (patch) | |
tree | b3798d7bab40ca5f9389b494fecaf97f72643dc3 | |
parent | 28a8fbbf1411a6fb5ddb678e59091777cc042e3b (diff) | |
download | pigweed-ba414d66e44e6932c34d90210cb691a47b79a2c8.tar.gz |
pw_rpc: Rename dev.pigweed.pw.rpc.internal package
For consistency with the dev.pigweed.pw_rpc package (which the rest of
the Java pw_rpc code lives in), this is renamed to also use the
underscore rather than the dot.
Bug: b/227385728
Change-Id: I4772d06f7541d79b3935c7b732d97882d0deda03
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/89400
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Ted Pudlik <tpudlik@google.com>
8 files changed, 15 insertions, 15 deletions
diff --git a/pw_rpc/internal/packet.proto b/pw_rpc/internal/packet.proto index 86fce960c..2862eb402 100644 --- a/pw_rpc/internal/packet.proto +++ b/pw_rpc/internal/packet.proto @@ -15,7 +15,7 @@ syntax = "proto3"; package pw.rpc.internal; -option java_package = "dev.pigweed.pw.rpc.internal"; +option java_package = "dev.pigweed.pw_rpc.internal"; enum PacketType { // To simplify identifying the origin of a packet, client-to-server packets 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 64d934b6b..ea3f7df9f 100644 --- a/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java +++ b/pw_rpc/java/main/dev/pigweed/pw_rpc/Client.java @@ -18,8 +18,8 @@ package dev.pigweed.pw_rpc; import com.google.protobuf.ExtensionRegistryLite; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.MessageLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; diff --git a/pw_rpc/java/main/dev/pigweed/pw_rpc/Packets.java b/pw_rpc/java/main/dev/pigweed/pw_rpc/Packets.java index 2af050c39..3260bb13f 100644 --- a/pw_rpc/java/main/dev/pigweed/pw_rpc/Packets.java +++ b/pw_rpc/java/main/dev/pigweed/pw_rpc/Packets.java @@ -15,8 +15,8 @@ package dev.pigweed.pw_rpc; import com.google.protobuf.MessageLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; /** Encodes pw_rpc packets of various types. */ /* package */ class Packets { diff --git a/pw_rpc/java/test/dev/pigweed/pw_rpc/ClientTest.java b/pw_rpc/java/test/dev/pigweed/pw_rpc/ClientTest.java index f3142b4c1..affffa598 100644 --- a/pw_rpc/java/test/dev/pigweed/pw_rpc/ClientTest.java +++ b/pw_rpc/java/test/dev/pigweed/pw_rpc/ClientTest.java @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableList; import com.google.protobuf.ExtensionRegistryLite; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.MessageLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import java.util.ArrayList; import java.util.List; import org.junit.Before; diff --git a/pw_rpc/java/test/dev/pigweed/pw_rpc/PacketsTest.java b/pw_rpc/java/test/dev/pigweed/pw_rpc/PacketsTest.java index a3dd4bfd4..6a1e771f8 100644 --- a/pw_rpc/java/test/dev/pigweed/pw_rpc/PacketsTest.java +++ b/pw_rpc/java/test/dev/pigweed/pw_rpc/PacketsTest.java @@ -17,8 +17,8 @@ package dev.pigweed.pw_rpc; import static com.google.common.truth.Truth.assertThat; import com.google.protobuf.ExtensionRegistryLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/pw_rpc/java/test/dev/pigweed/pw_rpc/RpcManagerTest.java b/pw_rpc/java/test/dev/pigweed/pw_rpc/RpcManagerTest.java index 0c8af5307..f25c66283 100644 --- a/pw_rpc/java/test/dev/pigweed/pw_rpc/RpcManagerTest.java +++ b/pw_rpc/java/test/dev/pigweed/pw_rpc/RpcManagerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import com.google.protobuf.MessageLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/pw_rpc/java/test/dev/pigweed/pw_rpc/StreamObserverCallTest.java b/pw_rpc/java/test/dev/pigweed/pw_rpc/StreamObserverCallTest.java index 71c4ec3fa..f4eba688b 100644 --- a/pw_rpc/java/test/dev/pigweed/pw_rpc/StreamObserverCallTest.java +++ b/pw_rpc/java/test/dev/pigweed/pw_rpc/StreamObserverCallTest.java @@ -20,10 +20,10 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; import dev.pigweed.pw_rpc.StreamObserverCall.StreamResponseFuture; import dev.pigweed.pw_rpc.StreamObserverCall.UnaryResponseFuture; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/pw_rpc/java/test/dev/pigweed/pw_rpc/TestClient.java b/pw_rpc/java/test/dev/pigweed/pw_rpc/TestClient.java index 0b2f10a2d..6688e2422 100644 --- a/pw_rpc/java/test/dev/pigweed/pw_rpc/TestClient.java +++ b/pw_rpc/java/test/dev/pigweed/pw_rpc/TestClient.java @@ -19,8 +19,8 @@ import static java.util.Arrays.stream; import com.google.common.collect.ImmutableList; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.MessageLite; -import dev.pigweed.pw.rpc.internal.Packet.PacketType; -import dev.pigweed.pw.rpc.internal.Packet.RpcPacket; +import dev.pigweed.pw_rpc.internal.Packet.PacketType; +import dev.pigweed.pw_rpc.internal.Packet.RpcPacket; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; |