Merge pull request #3 from github/nested-files

Support nested proto files

Author: BenEddy

plugin/src/main/java/com/flit/protoc/gen/server/TypeMapper.java

@@ -3,6 +3,7 @@
 import com.google.protobuf.DescriptorProtos;
 import com.squareup.javapoet.ClassName;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +35,8 @@ public static String getClassname(DescriptorProtos.FileDescriptorProto proto) {
 
     if (clazz == null || clazz.isEmpty()) {
 
-      char[] classname = proto.getName().substring(0, proto.getName().lastIndexOf('.')).toCharArray();
+      String basename = new File(proto.getName()).getName();
+      char[] classname = basename.substring(0, basename.lastIndexOf('.')).toCharArray();
       StringBuilder sb = new StringBuilder();
 
       char previous = '_';
@@ -70,7 +72,7 @@ public static String getClassname(DescriptorProtos.FileDescriptorProto proto) {
       }
     }
 
-    return clazz;
+    return String.join(".", proto.getOptions().getJavaPackage(), clazz);
   }
 
 }