Merge pull request #88 from salesforce/bugfix/jprotoc-filename

 Fix invalid character handling in proto file names

Author: rmichela

jprotoc-test/src/test/java/com/salesforce/jprotoc/CompletableFutureEndToEndTest.java

@@ -21,6 +21,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import com.salesforce.jprotoc.HelloWorldProto.*;
+
 import static org.awaitility.Awaitility.await;
 
 @SuppressWarnings("ALL")

jprotoc-test/src/test/java/com/salesforce/jprotoc/Jdk8GeneratorStructureTest.java

@@ -14,6 +14,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import com.salesforce.jprotoc.HelloWorldProto.*;
+
 import static org.junit.Assert.*;
 
 /**
@@ -63,7 +65,7 @@ public void GeneratedStubClassDerivesFromAbstractStub() throws Exception {
     public void GeneratedStubSubclassHasExpectedMethods() throws Exception {
         Class<?> clazz = Class.forName("com.salesforce.jprotoc.GreeterGrpc8$GreeterCompletableFutureStub");
 
-        Method method = clazz.getMethod("sayHello", com.salesforce.jprotoc.HelloRequest.class);
+        Method method = clazz.getMethod("sayHello", HelloRequest.class);
         assertNotNull(method);
         assertTrue(Modifier.isPublic(method.getModifiers()));
         assertEquals("CompletableFuture", method.getReturnType().getSimpleName());

jprotoc-test/src/test/java/com/salesforce/jprotoc/ProtoGenerationPresenceTest.java

@@ -0,0 +1,48 @@
+package com.salesforce.jprotoc;
+
+import com.example.v2.FrontendGrpc8;
+import my.someparameters.SomeParameterOuterClass;
+import nested.NestedGrpc8;
+import nested.NestedOuterClass;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This test verifies the existence of generated proto stubs. If generation is successful, the classes will be
+ * present to compile against.
+ */
+public class ProtoGenerationPresenceTest {
+    @Test
+    public void greeterGrpc8Exists() {
+        assertThat(GreeterGrpc8.class).isNotNull();
+    }
+
+    @Test
+    public void someParameterExists() {
+        assertThat(SomeParameterOuterClass.SomeParameter.class).isNotNull();
+    }
+
+    @Test
+    public void frontendGrpc8Exists() {
+        assertThat(FrontendGrpc8.class).isNotNull();
+    }
+
+    @Test
+    public void nestedGrpc8Exists() {
+        assertThat(NestedGrpc8.class).isNotNull();
+        assertThat(NestedOuterClass.Outer.MiddleAA.Inner.class).isNotNull();
+        assertThat(NestedOuterClass.Outer.MiddleBB.Inner.class).isNotNull();
+    }
+
+    @Test
+    public void currentTimeGrpc8Exists() {
+        assertThat(com.salesforce.invalid.dollar.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.plus.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.dot.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.number.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.dash.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.underscore.CurrentTimeGrpc8.class).isNotNull();
+        assertThat(com.salesforce.invalid.enye.CurrentTimeGrpc8.class).isNotNull();
+    }
+}

jprotoc-test/src/test/proto/helloworld.proto

@@ -6,7 +6,6 @@ import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 import "some_parameter.proto";
 
-option java_multiple_files = true;
 option java_package = "com.salesforce.jprotoc";
 option java_outer_classname = "HelloWorldProto";
 

jprotoc-test/src/test/proto/invalidClassNames/weyland$yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.dollar;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}

jprotoc-test/src/test/proto/invalidClassNames/weyland+yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.plus;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}

jprotoc-test/src/test/proto/invalidClassNames/weyland-yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.dash;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}

jprotoc-test/src/test/proto/invalidClassNames/weyland.yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.dot;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}

jprotoc-test/src/test/proto/invalidClassNames/weyland9yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.number;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}

jprotoc-test/src/test/proto/invalidClassNames/weyland_yutani.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.underscore;
+
+import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
+
+// The time - as a service.
+service CurrentTime {
+    // Sends the current time
+    rpc SayTime (google.protobuf.Empty) returns (TimeResponse) {}
+}
+
+// The response message containing the time
+message TimeResponse {
+    google.protobuf.Timestamp time = 1;
+}