Skip to content

Commit f831458

Browse files
author
nmittler
committed
Removing all references to "stubby"
1 parent aeeebb7 commit f831458

File tree

151 files changed

+1059
-1044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1059
-1044
lines changed

‎README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ datamodel/IDL/interface you are adapting. An example is provided of a binding to
1111

1212
#### Key Interfaces
1313

14-
[Stream Observer](https://github.com/google/grpc-java/blob/master/stub/src/main/java/com/google/net/stubby/stub/StreamObserver.java)
14+
[Stream Observer](https://github.com/google/grpc-java/blob/master/stub/src/main/java/io/grpc/stub/StreamObserver.java)
1515

1616

1717
## Channel
@@ -20,17 +20,17 @@ The 'channel' layer is an abstraction over transport handling that is suitable f
2020

2121
#### Common
2222

23-
* [Metadata - headers & trailers](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/Metadata.java)
24-
* [Status - error code namespace & handling](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/Status.java)
23+
* [Metadata - headers & trailers](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/Metadata.java)
24+
* [Status - error code namespace & handling](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/Status.java)
2525

2626
#### Client
27-
* [Channel - client side binding](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/Channel.java)
28-
* [Call](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/Call.java)
29-
* [Client Interceptor](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/ClientInterceptor.java)
27+
* [Channel - client side binding](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/Channel.java)
28+
* [Call](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/Call.java)
29+
* [Client Interceptor](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/ClientInterceptor.java)
3030

3131
#### Server
32-
* [Server call handler - analog to Channel on server](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/ServerCallHandler.java)
33-
* [Server Call](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/ServerCall.java)
32+
* [Server call handler - analog to Channel on server](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/ServerCallHandler.java)
33+
* [Server Call](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/ServerCall.java)
3434

3535

3636
## Transport
@@ -39,20 +39,20 @@ The 'transport' layer does the heavy lifting of putting & taking bytes off the w
3939

4040
#### Common
4141

42-
* [Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/Stream.java)
43-
* [Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/StreamListener.java)
42+
* [Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/Stream.java)
43+
* [Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/StreamListener.java)
4444

4545
#### Client
4646

47-
* [Client Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/ClientStream.java)
48-
* [Client Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java)
47+
* [Client Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/ClientStream.java)
48+
* [Client Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/ClientStreamListener.java)
4949

5050
#### Server
5151

52-
* [Server Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/ServerStream.java)
53-
* [Server Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java)
52+
* [Server Stream](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/ServerStream.java)
53+
* [Server Stream Listener](https://github.com/google/grpc-java/blob/master/core/src/main/java/io/grpc/transport/ServerStreamListener.java)
5454

5555

5656
# Examples
5757

58-
Tests showing how these layers are composed to execute calls using protobuf messages can be found here https://github.com/google/grpc-java/tree/master/integration-testing/src/main/java/com/google/net/stubby/testing/integration
58+
Tests showing how these layers are composed to execute calls using protobuf messages can be found here https://github.com/google/grpc-java/tree/master/integration-testing/src/main/java/io/grpc/testing/integration

‎all/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
description = "Stubby: All"
1+
description = "gRPC: All"
22

33
// Make sure that no transitive dependencies are included.
44
configurations.compile.transitive = false
55

66
dependencies {
7-
compile project(':stubby-core'),
8-
project(':stubby-stub'),
9-
project(':stubby-auth'),
10-
project(':stubby-netty'),
11-
project(':stubby-okhttp')
7+
compile project(':grpc-core'),
8+
project(':grpc-stub'),
9+
project(':grpc-auth'),
10+
project(':grpc-netty'),
11+
project(':grpc-okhttp')
1212
}
1313

1414
// Create a fat jar containing only the direct dependencies

‎auth/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ plugins {
22
id "be.insaneprogramming.gradle.animalsniffer" version "1.4.0"
33
}
44

5-
description = "Stubby: Auth"
5+
description = "gRpc: Auth"
66
dependencies {
7-
compile project(':stubby-core'),
7+
compile project(':grpc-core'),
88
libraries.oauth_client,
99
libraries.javaee_api
1010
}

auth/src/main/java/com/google/net/stubby/auth/OAuth2AccessTokenProvider.java renamed to auth/src/main/java/io/grpc/auth/OAuth2AccessTokenProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

32-
package com.google.net.stubby.auth;
32+
package io.grpc.auth;
3333

3434
import com.google.api.client.auth.oauth2.Credential;
3535
import com.google.common.base.Preconditions;

auth/src/main/java/com/google/net/stubby/auth/OAuth2ChannelInterceptor.java renamed to auth/src/main/java/io/grpc/auth/OAuth2ChannelInterceptor.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@
2929
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131

32-
package com.google.net.stubby.auth;
32+
package io.grpc.auth;
3333

3434
import com.google.api.client.auth.oauth2.Credential;
35-
import com.google.net.stubby.Call;
36-
import com.google.net.stubby.Channel;
37-
import com.google.net.stubby.ClientInterceptor;
38-
import com.google.net.stubby.ClientInterceptors.ForwardingCall;
39-
import com.google.net.stubby.Metadata;
40-
import com.google.net.stubby.MethodDescriptor;
35+
36+
import io.grpc.Call;
37+
import io.grpc.Channel;
38+
import io.grpc.ClientInterceptor;
39+
import io.grpc.ClientInterceptors.ForwardingCall;
40+
import io.grpc.Metadata;
41+
import io.grpc.MethodDescriptor;
4142

4243
import java.util.concurrent.Executor;
4344

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ subprojects {
33
apply plugin: "maven"
44
apply plugin: "idea"
55

6-
group = "com.google.net.stubby"
6+
group = "io.grpc"
77
version = "0.1.0-SNAPSHOT"
88

99
sourceCompatibility = 1.6

‎compiler/run_test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ GOLDEN_FILE="$TEST_SRC_DIR/TestService.java.txt"
1515
protoc --plugin=protoc-gen-java_rpc=build/binaries/java_pluginExecutable/java_plugin \
1616
--java_rpc_out="$OUTPUT_FILE" --proto_path="$TEST_SRC_DIR" "$INPUT_FILE" && \
1717
unzip -o -d "$TEST_TMP_DIR" "$OUTPUT_FILE" && \
18-
diff "$TEST_TMP_DIR/com/google/net/stubby/testing/integration/TestServiceGrpc.java" \
18+
diff "$TEST_TMP_DIR/io/grpc/testing/integration/TestServiceGrpc.java" \
1919
"$GOLDEN_FILE" && \
2020
echo "PASS"

‎compiler/src/java_generator.cc‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -470,11 +470,11 @@ static void PrintBindServiceMethod(const ServiceDescriptor* service,
470470
if (client_streaming) {
471471
(*vars)["calls_method"] = "asyncStreamingRequestCall";
472472
(*vars)["invocation_class"] =
473-
"com.google.net.stubby.stub.ServerCalls.StreamingRequestMethod";
473+
"io.grpc.stub.ServerCalls.StreamingRequestMethod";
474474
} else {
475475
(*vars)["calls_method"] = "asyncUnaryRequestCall";
476476
(*vars)["invocation_class"] =
477-
"com.google.net.stubby.stub.ServerCalls.UnaryRequestMethod";
477+
"io.grpc.stub.ServerCalls.UnaryRequestMethod";
478478
}
479479
p->Print(*vars, ".addMethod(createMethodDefinition(\n");
480480
p->Indent();
@@ -586,27 +586,27 @@ static void PrintService(const ServiceDescriptor* service,
586586
void PrintImports(Printer* p) {
587587
p->Print(
588588
"import static "
589-
"com.google.net.stubby.stub.Calls.createMethodDescriptor;\n"
589+
"io.grpc.stub.Calls.createMethodDescriptor;\n"
590590
"import static "
591-
"com.google.net.stubby.stub.Calls.asyncUnaryCall;\n"
591+
"io.grpc.stub.Calls.asyncUnaryCall;\n"
592592
"import static "
593-
"com.google.net.stubby.stub.Calls.asyncServerStreamingCall;\n"
593+
"io.grpc.stub.Calls.asyncServerStreamingCall;\n"
594594
"import static "
595-
"com.google.net.stubby.stub.Calls.asyncClientStreamingCall;\n"
595+
"io.grpc.stub.Calls.asyncClientStreamingCall;\n"
596596
"import static "
597-
"com.google.net.stubby.stub.Calls.duplexStreamingCall;\n"
597+
"io.grpc.stub.Calls.duplexStreamingCall;\n"
598598
"import static "
599-
"com.google.net.stubby.stub.Calls.blockingUnaryCall;\n"
599+
"io.grpc.stub.Calls.blockingUnaryCall;\n"
600600
"import static "
601-
"com.google.net.stubby.stub.Calls.blockingServerStreamingCall;\n"
601+
"io.grpc.stub.Calls.blockingServerStreamingCall;\n"
602602
"import static "
603-
"com.google.net.stubby.stub.Calls.unaryFutureCall;\n"
603+
"io.grpc.stub.Calls.unaryFutureCall;\n"
604604
"import static "
605-
"com.google.net.stubby.stub.ServerCalls.createMethodDefinition;\n"
605+
"io.grpc.stub.ServerCalls.createMethodDefinition;\n"
606606
"import static "
607-
"com.google.net.stubby.stub.ServerCalls.asyncUnaryRequestCall;\n"
607+
"io.grpc.stub.ServerCalls.asyncUnaryRequestCall;\n"
608608
"import static "
609-
"com.google.net.stubby.stub.ServerCalls.asyncStreamingRequestCall;\n\n");
609+
"io.grpc.stub.ServerCalls.asyncStreamingRequestCall;\n\n");
610610
}
611611

612612
void GenerateService(const ServiceDescriptor* service,
@@ -616,18 +616,18 @@ void GenerateService(const ServiceDescriptor* service,
616616
map<string, string> vars;
617617
vars["String"] = "java.lang.String";
618618
vars["Override"] = "java.lang.Override";
619-
vars["Channel"] = "com.google.net.stubby.Channel";
620-
vars["MethodType"] = "com.google.net.stubby.MethodType";
619+
vars["Channel"] = "io.grpc.Channel";
620+
vars["MethodType"] = "io.grpc.MethodType";
621621
vars["ServerServiceDefinition"] =
622-
"com.google.net.stubby.ServerServiceDefinition";
623-
vars["AbstractStub"] = "com.google.net.stubby.stub.AbstractStub";
624-
vars["Method"] = "com.google.net.stubby.stub.Method";
622+
"io.grpc.ServerServiceDefinition";
623+
vars["AbstractStub"] = "io.grpc.stub.AbstractStub";
624+
vars["Method"] = "io.grpc.stub.Method";
625625
vars["AbstractServiceDescriptor"] =
626-
"com.google.net.stubby.stub.AbstractServiceDescriptor";
626+
"io.grpc.stub.AbstractServiceDescriptor";
627627
vars["ImmutableList"] = "com.google.common.collect.ImmutableList";
628-
vars["MethodDescriptor"] = "com.google.net.stubby.MethodDescriptor";
629-
vars["ProtoUtils"] = "com.google.net.stubby.proto.ProtoUtils";
630-
vars["StreamObserver"] = "com.google.net.stubby.stub.StreamObserver";
628+
vars["MethodDescriptor"] = "io.grpc.MethodDescriptor";
629+
vars["ProtoUtils"] = "io.grpc.proto.ProtoUtils";
630+
vars["StreamObserver"] = "io.grpc.stub.StreamObserver";
631631
vars["Iterator"] = "java.util.Iterator";
632632
vars["Map"] = "java.util.Map";
633633
vars["TimeUnit"] = "java.util.concurrent.TimeUnit";

0 commit comments

Comments
 (0)