grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change AbstractServiceDescriptor.methods() to Collection. Resolves #573

This commit is contained in:
Kun Zhang 2015-07-09 10:15:58 -07:00
parent 3ee5b5a752
commit c73b75e477
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/src/generated/main/grpc/io/grpc/testing/TestServiceGrpc.java
View File

@ -79,7 +79,7 @@ public class TestServiceGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
unaryCall, unaryCall,
streamingCall); streamingCall);

2
benchmarks/src/generated/main/grpc/io/grpc/testing/WorkerGrpc.java
View File

@ -79,7 +79,7 @@ public class WorkerGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
runTest, runTest,
runServer); runServer);

3
compiler/src/java_plugin/cpp/java_generator.cpp
View File

@ -204,7 +204,7 @@ static void PrintServiceDescriptor(
p->Print( p->Print(
*vars, *vars,
"@$Override$\n" "@$Override$\n"
"public $ImmutableList$<$MethodDescriptor$<?, ?>> methods() {\n"); "public $Collection$<$MethodDescriptor$<?, ?>> methods() {\n");
p->Indent(); p->Indent();
p->Print( p->Print(
*vars, *vars,
@ -674,6 +674,7 @@ void GenerateService(const ServiceDescriptor* service,
vars["AbstractServiceDescriptor"] = vars["AbstractServiceDescriptor"] =
"io.grpc.stub.AbstractServiceDescriptor"; "io.grpc.stub.AbstractServiceDescriptor";
vars["ImmutableList"] = "com.google.common.collect.ImmutableList"; vars["ImmutableList"] = "com.google.common.collect.ImmutableList";
vars["Collection"] = "java.util.Collection";
vars["MethodDescriptor"] = "io.grpc.MethodDescriptor"; vars["MethodDescriptor"] = "io.grpc.MethodDescriptor";
vars["ProtoUtils"] = "io.grpc.protobuf.ProtoUtils"; vars["ProtoUtils"] = "io.grpc.protobuf.ProtoUtils";
vars["NanoUtils"] = "io.grpc.protobuf.nano.NanoUtils"; vars["NanoUtils"] = "io.grpc.protobuf.nano.NanoUtils";

2
compiler/src/test/golden/TestService.java.txt
View File

@ -121,7 +121,7 @@ public class TestServiceGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
unaryCall, unaryCall,
streamingOutputCall, streamingOutputCall,

2
compiler/src/test/golden/TestServiceNano.java.txt
View File

@ -183,7 +183,7 @@ public class TestServiceGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
unaryCall, unaryCall,
streamingOutputCall, streamingOutputCall,

2
examples/src/generated/main/grpc/io/grpc/examples/helloworld/GreeterGrpc.java
View File

@ -65,7 +65,7 @@ public class GreeterGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
sayHello); sayHello);
} }

2
examples/src/generated/main/grpc/io/grpc/examples/routeguide/RouteGuideGrpc.java
View File

@ -107,7 +107,7 @@ public class RouteGuideGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
getFeature, getFeature,
listFeatures, listFeatures,

2
interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
View File

@ -135,7 +135,7 @@ public class TestServiceGrpc {
} }
@java.lang.Override @java.lang.Override
public com.google.common.collect.ImmutableList<io.grpc.MethodDescriptor<?, ?>> methods() { public java.util.Collection<io.grpc.MethodDescriptor<?, ?>> methods() {
return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of( return com.google.common.collect.ImmutableList.<io.grpc.MethodDescriptor<?, ?>>of(
emptyCall, emptyCall,
unaryCall, unaryCall,

7
stub/src/main/java/io/grpc/stub/AbstractServiceDescriptor.java
View File

@ -31,10 +31,9 @@
package io.grpc.stub; package io.grpc.stub;
import com.google.common.collect.ImmutableList;
import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor;
import java.util.Collection;
import java.util.Map; import java.util.Map;
/** /**
@ -45,9 +44,9 @@ import java.util.Map;
public abstract class AbstractServiceDescriptor<T extends AbstractServiceDescriptor<?>> { public abstract class AbstractServiceDescriptor<T extends AbstractServiceDescriptor<?>> {
/** /**
* Returns the list of operations defined in the stub configuration. * Returns an immutable collection of methods defined in the stub configuration.
*/ */
public abstract ImmutableList<MethodDescriptor<?, ?>> methods(); public abstract Collection<MethodDescriptor<?, ?>> methods();
/** /**
* Returns a new stub configuration for the provided method configurations. * Returns a new stub configuration for the provided method configurations.