Fix invalid character handling in proto file names

Author: rmichela

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

@@ -37,6 +37,12 @@ public void nestedGrpc8Exists() {
 
     @Test
     public void currentTimeGrpc8Exists() {
-        assertThat(CurrentTimeGrpc8.class).isNotNull();
+        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/weylandyutani.proto renamed to jprotoc-test/src/test/proto/invalidClassNames/weyland$yutani.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 
+package com.salesforce.invalid.dollar;
+
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 
-option java_package = "com.salesforce.jprotoc";
-
 // The time - as a service.
 service CurrentTime {
     // Sends the current time

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;
+}

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

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package com.salesforce.invalid.enye;
+
+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/src/main/java/com/salesforce/jprotoc/ProtoTypeMap.java

@@ -7,10 +7,7 @@
 
 package com.salesforce.jprotoc;
 
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
+import com.google.common.base.*;
 import com.google.common.collect.ImmutableMap;
 import com.google.protobuf.DescriptorProtos;
 
@@ -142,7 +139,9 @@ private static String getJavaOuterClassname(
             filename = filename.substring(filename.lastIndexOf('/') + 1);
         }
 
+        filename = makeInvalidCharactersUnderscores(filename);
         filename = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, filename);
+        filename = upcaseAfterNumber(filename);
         filename = appendOuterClassSuffix(filename, fileDescriptor);
         return filename;
     }
@@ -160,4 +159,32 @@ private static String appendOuterClassSuffix(final String enclosingClassName, De
             return enclosingClassName;
         }
     }
+
+    /**
+     * Replace invalid proto identifier characters with an underscore, so they will be dropped and camel cases below.
+     * https://developers.google.com/protocol-buffers/docs/reference/proto3-spec
+     */
+    private static String makeInvalidCharactersUnderscores(String filename) {
+        char[] filechars = filename.toCharArray();
+        for (int i = 0; i < filechars.length; i++) {
+            char c = filechars[i];
+            if (!CharMatcher.inRange('0', '9').or(CharMatcher.inRange('A', 'Z')).or(CharMatcher.inRange('a', 'z')).matches(c)) {
+                filechars[i] = '_';
+            }
+        }
+        return new String(filechars);
+    }
+
+    /**
+     * Upper case characters after numbers, like {@code Weyland9Yutani}.
+     */
+    private static String upcaseAfterNumber(String filename) {
+        char[] filechars = filename.toCharArray();
+        for (int i = 1; i < filechars.length; i++) {
+            if (CharMatcher.inRange('0', '9').matches(filechars[i - 1])) {
+                filechars[i] = Character.toUpperCase(filechars[i]);
+            }
+        }
+        return new String(filechars);
+    }
 }