Some post-merge refactoring for #87

Author: cowtowncoder

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufMapper.java

@@ -1,9 +1,16 @@
 package com.fasterxml.jackson.dataformat.protobuf;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.protobuf.schema.DescriptorLoader;
+import com.fasterxml.jackson.dataformat.protobuf.schema.FileDescriptorSet;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
 import com.fasterxml.jackson.dataformat.protobuf.schemagen.ProtobufSchemaGenerator;
@@ -14,6 +21,14 @@ public class ProtobufMapper extends ObjectMapper
 
     protected ProtobufSchemaLoader _schemaLoader = ProtobufSchemaLoader.std;
 
+    /**
+     * Lazily constructed instance of {@link DescriptorLoader}, used for loading
+     * structured protoc definitions from multiple files.
+     *
+     * @since 2.9
+     */
+    protected DescriptorLoader _descriptorLoader;
+
     /*
     /**********************************************************
     /* Life-cycle
@@ -51,7 +66,7 @@ public ProtobufFactory getFactory() {
 
     /*
     /**********************************************************
-    /* Schema access
+    /* Schema access, single protoc source
     /**********************************************************
      */
 
@@ -95,4 +110,46 @@ public ProtobufSchema generateSchemaFor(Class<?> type) throws JsonMappingExcepti
         acceptJsonFormatVisitor(type, gen);
         return gen.getGeneratedSchema();
     }
+
+    /*
+    /**********************************************************
+    /* Schema access, FileDescriptorSets (since 2.9)
+    /**********************************************************
+     */
+
+    /**
+     * @since 2.9
+     */
+    public FileDescriptorSet loadDescriptorSet(URL src) throws IOException {
+        return descriptorLoader().load(src);
+    }
+
+    /**
+     * @since 2.9
+     */
+    public FileDescriptorSet loadDescriptorSet(File src) throws IOException {
+        return descriptorLoader().load(src);
+    }
+
+    /**
+     * @since 2.9
+     */
+    public FileDescriptorSet loadDescriptorSet(InputStream src) throws IOException {
+        return descriptorLoader().load(src);
+    }
+
+    /**
+     * Accessors that may be used instead of convenience <code>loadDescriptorSet</code>
+     * methods, if alternate sources need to be used.
+     *
+     * @since 2.9
+     */
+    public synchronized DescriptorLoader descriptorLoader() throws IOException
+    {
+        DescriptorLoader l = _descriptorLoader;
+        if (l == null) {
+            _descriptorLoader = l = DescriptorLoader.construct(this);
+        }
+        return l;
+    }
 }

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

@@ -1,82 +1,72 @@
 package com.fasterxml.jackson.dataformat.protobuf.schema;
 
-
-import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
-
-import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Reader;
 import java.net.URL;
 
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
+
 /**
  * Class used for loading protobuf descriptors (from .desc files
  * or equivalent sources), to construct FileDescriptorSet.
+ *
+ * @since 2.9
  */
 public class DescriptorLoader
 {
-    private final String DESCRIPTOR_PROTO = "/descriptor.proto";
-    private ProtobufMapper descriptorMapper;
-    private ProtobufSchema descriptorFileSchema;
+    protected final static String DESCRIPTOR_PROTO = "/descriptor.proto";
 
     /**
-     * Standard loader instance that is usually used for loading descriptor file.
+     * Fully configured reader for {@link FileDescriptorSet} objects.
      */
-    public final static DescriptorLoader std = new DescriptorLoader();
-
-    public DescriptorLoader() {}
+    protected final ObjectReader _reader;
 
-
-    /**
-     * Public API
-     */
-
-    public FileDescriptorSet load(URL url) throws IOException
-    {
-        return _loadFileDescriptorSet(url.openStream());
+    public DescriptorLoader(ObjectReader reader) {
+        _reader = reader;
     }
 
-    public FileDescriptorSet load(File f) throws IOException
+    public static DescriptorLoader construct(ProtobufMapper mapper) throws IOException
     {
-        return _loadFileDescriptorSet(new FileInputStream(f));
+        ProtobufSchema schema;
+        try (InputStream in = DescriptorLoader.class.getResourceAsStream(DESCRIPTOR_PROTO)) {
+            schema = mapper.schemaLoader().load(in, "FileDescriptorSet");
+        }
+        return new DescriptorLoader(mapper.readerFor(FileDescriptorSet.class)
+                .with(schema));
     }
 
-    public FileDescriptorSet load(InputStream in) throws IOException
+    /*
+    /**********************************************************************
+    /* Public API
+    /**********************************************************************
+     */
+
+    public FileDescriptorSet load(URL src) throws IOException
     {
-        return _loadFileDescriptorSet(in);
+        return _reader.readValue(src);
     }
 
-    public FileDescriptorSet fromBytes(byte[] descriptorBytes) throws IOException
+    public FileDescriptorSet load(File src) throws IOException
     {
-        return _loadFileDescriptorSet(new ByteArrayInputStream(descriptorBytes));
+        return _reader.readValue(src);
     }
 
-    protected FileDescriptorSet _loadFileDescriptorSet(InputStream in) throws IOException
+    /**
+     * Note: passed {@link java.io.InputStream} will be closed by this method.
+     */
+    public FileDescriptorSet load(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) {
-            }
-        }
+        return _reader.readValue(in);
     }
 
-    private void createDescriptorMapper() throws IOException
+    /**
+     * Note: passed {@link java.io.Reader} will be closed by this method.
+     */
+    public FileDescriptorSet load(Reader r) throws IOException
     {
-        // read Descriptor Proto
-        descriptorMapper = new ProtobufMapper();
-        InputStream in = getClass().getResourceAsStream(DESCRIPTOR_PROTO);
-        descriptorFileSchema = ProtobufSchemaLoader.std.load(in, "FileDescriptorSet");
-        in.close();
+        return _reader.readValue(r);
     }
 }