compiler: Add option to disable version output

If the option becomes popular, we can just remove the version.
2016-06-16 13:54:12 -07:00 · 2016-06-16 13:54:12 -07:00 · 182164eafc
parent ab65c797bf
commit 182164eafc
19 changed files with 31 additions and 22 deletions
--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: services.proto")
 public final class BenchmarkServiceGrpc {

--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: services.proto")
 public final class ReportQpsScenarioServiceGrpc {

--- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
+++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: services.proto")
 public final class WorkerServiceGrpc {

--- a/build.gradle
+++ b/build.gradle
@ -130,6 +130,7 @@ subprojects {
                      // To generate deprecated interfaces and static bindService method,
                      // turn the enable_deprecated option to true below:
                      option 'enable_deprecated=false'
+                      option 'noversion'
                    }
                  }
                }
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@ -1023,14 +1023,16 @@ static void PrintService(const ServiceDescriptor* service,
                         std::map<string, string>* vars,
                         Printer* p,
                         ProtoFlavor flavor,
-                         bool enable_deprecated) {
+                         bool enable_deprecated,
+                         bool disable_version) {
  (*vars)["service_name"] = service->name();
  (*vars)["file_name"] = service->file()->name();
  (*vars)["service_class_name"] = ServiceClassName(service);
-  #ifdef GRPC_VERSION
-    (*vars)["grpc_version"] = " (version " XSTR(GRPC_VERSION) ")";
-  #else
  (*vars)["grpc_version"] = "";
+  #ifdef GRPC_VERSION
+  if (!disable_version) {
+    (*vars)["grpc_version"] = " (version " XSTR(GRPC_VERSION) ")";
+  }
  #endif
  // TODO(nmittler): Replace with WriteServiceDocComment once included by protobuf distro.
  GrpcWriteServiceDocComment(p, service);
@ -1168,7 +1170,8 @@ void PrintImports(Printer* p, bool generate_nano) {
 void GenerateService(const ServiceDescriptor* service,
                     google::protobuf::io::ZeroCopyOutputStream* out,
                     ProtoFlavor flavor,
-                     bool enable_deprecated) {
+                     bool enable_deprecated,
+                     bool disable_version) {
  // All non-generated classes must be referred by fully qualified names to
  // avoid collision with generated classes.
  std::map<string, string> vars;
@ -1212,7 +1215,7 @@ void GenerateService(const ServiceDescriptor* service,
  if (!vars["Package"].empty()) {
    vars["Package"].append(".");
  }
-  PrintService(service, &vars, &printer, flavor, enable_deprecated);
+  PrintService(service, &vars, &printer, flavor, enable_deprecated, disable_version);
 }

 string ServiceJavaPackage(const FileDescriptor* file, bool nano) {
--- a/compiler/src/java_plugin/cpp/java_generator.h
+++ b/compiler/src/java_plugin/cpp/java_generator.h
@ -50,7 +50,8 @@ string ServiceClassName(const google::protobuf::ServiceDescriptor* service);
 void GenerateService(const google::protobuf::ServiceDescriptor* service,
                     google::protobuf::io::ZeroCopyOutputStream* out,
                     ProtoFlavor flavor,
-                     bool enable_deprecated);
+                     bool enable_deprecated,
+                     bool disable_version);

 }  // namespace java_grpc_generator

--- a/compiler/src/java_plugin/cpp/java_plugin.cpp
+++ b/compiler/src/java_plugin/cpp/java_plugin.cpp
@ -38,6 +38,7 @@ class JavaGrpcGenerator : public google::protobuf::compiler::CodeGenerator {
        java_grpc_generator::ProtoFlavor::NORMAL;

    bool enable_deprecated = false;
+    bool disable_version = false;
    for (size_t i = 0; i < options.size(); i++) {
      if (options[i].first == "nano") {
        flavor = java_grpc_generator::ProtoFlavor::NANO;
@ -45,6 +46,8 @@ class JavaGrpcGenerator : public google::protobuf::compiler::CodeGenerator {
        flavor = java_grpc_generator::ProtoFlavor::LITE;
      } else if (options[i].first == "enable_deprecated") {
        enable_deprecated = options[i].second == "true";
+      } else if (options[i].first == "noversion") {
+        disable_version = true;
      }
    }

@ -57,7 +60,8 @@ class JavaGrpcGenerator : public google::protobuf::compiler::CodeGenerator {
          + java_grpc_generator::ServiceClassName(service) + ".java";
      std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> output(
          context->Open(filename));
-      java_grpc_generator::GenerateService(service, output.get(), flavor, enable_deprecated);
+      java_grpc_generator::GenerateService(
+          service, output.get(), flavor, enable_deprecated, disable_version);
    }
    return true;
  }
--- a/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
+++ b/grpclb/src/generated/main/grpc/io/grpc/grpclb/LoadBalancerGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: load_balancer.proto")
 public final class LoadBalancerGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/testing/integration/metrics.proto")
 public final class MetricsServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/testing/integration/test.proto")
 public final class ReconnectServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/TestServiceGrpc.java
@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/testing/integration/test.proto")
 public final class TestServiceGrpc {

--- a/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
+++ b/interop-testing/src/generated/main/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java
@ -22,7 +22,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/testing/integration/test.proto")
 public final class UnimplementedServiceGrpc {

--- a/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/health/v1/HealthGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: health.proto")
 public final class HealthGrpc {

--- a/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/instrumentation/v1alpha/MonitoringGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: grpc/instrumentation/v1alpha/monitoring.proto")
 public final class MonitoringGrpc {

--- a/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
+++ b/services/src/generated/main/grpc/io/grpc/reflection/v1alpha/ServerReflectionGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/reflection/v1alpha/reflection.proto")
 public final class ServerReflectionGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/AnotherDynamicServiceGrpc.java
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
 public final class AnotherDynamicServiceGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/DynamicServiceGrpc.java
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/reflection/testing/dynamic_reflection_test.proto")
 public final class DynamicServiceGrpc {

--- a/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
+++ b/services/src/generated/test/grpc/io/grpc/reflection/testing/ReflectableServiceGrpc.java
@ -18,7 +18,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 /**
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/reflection/testing/reflection_test.proto")
 public final class ReflectableServiceGrpc {

--- a/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
+++ b/testing-proto/src/generated/main/grpc/io/grpc/testing/protobuf/SimpleServiceGrpc.java
@ -21,7 +21,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall;
 * </pre>
 */
@javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.7.0-SNAPSHOT)",
+    value = "by gRPC proto compiler",
    comments = "Source: io/grpc/testing/protobuf/simpleservice.proto")
 public final class SimpleServiceGrpc {