use POJOs instead of JsonNode for the descriptor PB

- rename DescriptorReader to DescriptorLoader
 - return ProtobufSchema instead of NativeProtobufSchema
 - find the main .proto file by message type.
 - remove "main .proto file" concept.
- introduce FileDescriptorSet POJO

Author: knoguchi

protobuf/pom.xml

@@ -47,6 +47,10 @@ abstractions.
       <artifactId>jackson-annotations</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/schema/DescriptorLoader.java

@@ -0,0 +1,89 @@
+package com.fasterxml.jackson.dataformat.protobuf.schema;
+
+
+import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
+import com.squareup.protoparser.ProtoFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * Class used for loading protobuf descriptors (from .desc files
+ * or equivalent sources), to construct native schema.
+ * <p>
+ * Note that proto name argument is optional if (and only if) desired
+ * root file is the first file in definition; otherwise an
+ * exception will be thrown.
+ */
+public class DescriptorLoader
+{
+    private final String DESCRIPTOR_PROTO = "/descriptor.proto";
+    private ProtobufMapper descriptorMapper;
+    private ProtobufSchema descriptorFileSchema;
+    private Map<String, ProtoFile> protoFileMap;
+
+    /**
+     * Standard loader instance that is usually used for loading descriptor file.
+     */
+    public final static DescriptorLoader std = new DescriptorLoader();
+
+    public DescriptorLoader() {}
+
+
+    /**
+     * Public API
+     */
+
+    public FileDescriptorSet load(URL url) throws IOException
+    {
+        return _loadFileDescriptorSet(url.openStream());
+    }
+
+    public FileDescriptorSet load(File f) throws IOException
+    {
+        return _loadFileDescriptorSet(new FileInputStream(f));
+    }
+
+    public FileDescriptorSet load(InputStream in) throws IOException
+    {
+        return _loadFileDescriptorSet(in);
+    }
+
+    public FileDescriptorSet fromBytes(byte[] descriptorBytes) throws IOException
+    {
+        return _loadFileDescriptorSet(new ByteArrayInputStream(descriptorBytes));
+    }
+
+    protected FileDescriptorSet _loadFileDescriptorSet(InputStream in) throws IOException
+    {
+        try {
+            if (descriptorMapper == null) {
+                createDescriptorMapper();
+            }
+            return descriptorMapper.readerFor(FileDescriptorSet.class)
+                                   .with(descriptorFileSchema)
+                                   .readValue(in);
+        }
+        finally {
+            try {
+                in.close();
+            }
+            catch (IOException e) {
+            }
+        }
+    }
+
+    private void createDescriptorMapper() throws IOException
+    {
+        // read Descriptor Proto
+        descriptorMapper = new ProtobufMapper();
+        InputStream in = getClass().getResourceAsStream(DESCRIPTOR_PROTO);
+        descriptorFileSchema = ProtobufSchemaLoader.std.load(in, "FileDescriptorSet");
+        in.close();
+    }
+}