Try to fix that one pesky little test failure for protobuf module

Author: cowtowncoder

protobuf/src/main/java/module-info.java

@@ -4,14 +4,16 @@
     requires tools.jackson.core;
     requires tools.jackson.databind;
 
+    // No module-info nor Automatic-Module-Name; relies on jar name:
     requires protoparser;
 
     exports tools.jackson.dataformat.protobuf;
-// No, should not expose shaded
-//    exports tools.jackson.dataformat.protobuf.protoparser.protoparser;
     exports tools.jackson.dataformat.protobuf.schema;
     exports tools.jackson.dataformat.protobuf.schemagen;
 
+    // Need to "opens" to allow reading resource `descriptor.proto`
+    opens tools.jackson.dataformat.protobuf.schema;
+
     provides tools.jackson.core.TokenStreamFactory with
         tools.jackson.dataformat.protobuf.ProtobufFactory;
     provides tools.jackson.databind.ObjectMapper with

protobuf/src/main/java/tools/jackson/dataformat/protobuf/schema/DescriptorLoader.java

@@ -15,7 +15,8 @@
  */
 public class DescriptorLoader
 {
-    protected final static String DESCRIPTOR_PROTO = "/descriptor.proto";
+    protected final static String DESCRIPTOR_PROTO = "/tools/jackson/dataformat/protobuf/schema/descriptor.proto";
+    //protected final static String DESCRIPTOR_PROTO = "descriptor.proto";
 
     /**
      * Fully configured reader for {@link FileDescriptorSet} objects.
@@ -38,13 +39,20 @@ public static DescriptorLoader construct(ProtobufMapper mapper) throws IOExcepti
     }
 
     /**
-     * @param mapper {@link ObjectMapper} that can reader protoc content.
+     * @param mapper {@link ObjectMapper} that can read protoc content.
      */
     public static DescriptorLoader construct(ObjectMapper mapper,
             ProtobufSchemaLoader schemaLoader) throws IOException
     {
         ProtobufSchema schema;
-        try (InputStream in = DescriptorLoader.class.getResourceAsStream(DESCRIPTOR_PROTO)) {
+        final Class<?> ctxt = DescriptorLoader.class;
+        final String resourceName = DESCRIPTOR_PROTO;
+        try (InputStream in = ctxt.getResourceAsStream(resourceName)) {
+            if (in == null) {
+                throw new IllegalStateException(String.format(
+                        "Can not find resource `%s` within context '%s'",
+                        resourceName, ctxt.getName()));
+            }
             schema = schemaLoader.load(in, "FileDescriptorSet");
         }
         return new DescriptorLoader(mapper.readerFor(FileDescriptorSet.class)

protobuf/src/main/java/tools/jackson/dataformat/protobuf/schema/ProtobufSchemaLoader.java

@@ -3,6 +3,7 @@
 import java.io.*;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Objects;
 
 import com.squareup.protoparser.ProtoFile;
 import com.squareup.protoparser.ProtoParser;
@@ -40,27 +41,27 @@ public ProtobufSchemaLoader() { }
      */
 
     public ProtobufSchema load(URL url) throws IOException {
-        return loadNative(url).forFirstType();
+        return loadNative(Objects.requireNonNull(url)).forFirstType();
     }
 
     /**
      * @param rootTypeName Name of message type in schema definition that is
      *   the root value to read/write
      */
     public ProtobufSchema load(URL url, String rootTypeName) throws IOException {
-        return loadNative(url).forType(rootTypeName);
+        return loadNative(Objects.requireNonNull(url)).forType(rootTypeName);
     }
 
     public ProtobufSchema load(File f) throws IOException {
-        return loadNative(f).forFirstType();
+        return loadNative(Objects.requireNonNull(f)).forFirstType();
     }
 
     /**
      * @param rootTypeName Name of message type in schema definition that is
      *   the root value to read/write
      */
     public ProtobufSchema load(File f, String rootTypeName) throws IOException {
-        return loadNative(f).forType(rootTypeName);
+        return loadNative(Objects.requireNonNull(f)).forType(rootTypeName);
     }
 
     /**
@@ -69,15 +70,15 @@ public ProtobufSchema load(File f, String rootTypeName) throws IOException {
      * Note that given {@link InputStream} will be closed before method returns.
      */
     public ProtobufSchema load(InputStream in) throws IOException {
-        return loadNative(in, true).forFirstType();
+        return loadNative(Objects.requireNonNull(in), true).forFirstType();
     }
 
     /**
      * @param rootTypeName Name of message type in schema definition that is
      *   the root value to read/write
      */
     public ProtobufSchema load(InputStream in, String rootTypeName) throws IOException {
-        return loadNative(in, true).forType(rootTypeName);
+        return loadNative(Objects.requireNonNull(in), true).forType(rootTypeName);
     }
 
     /**
@@ -86,15 +87,15 @@ public ProtobufSchema load(InputStream in, String rootTypeName) throws IOExcepti
      * Note that given {@link Reader} will be closed before method returns.
      */
     public ProtobufSchema load(Reader r) throws IOException {
-        return loadNative(r, true).forFirstType();
+        return loadNative(Objects.requireNonNull(r), true).forFirstType();
     }
 
     /**
      * @param rootTypeName Name of message type in schema definition that is
      *   the root value to read/write
      */
     public ProtobufSchema load(Reader r, String rootTypeName) throws IOException {
-        return loadNative(r, true).forType(rootTypeName);
+        return loadNative(Objects.requireNonNull(r), true).forType(rootTypeName);
     }
 
     /**
@@ -120,22 +121,27 @@ public ProtobufSchema parse(String schemaAsString, String rootTypeName) throws I
      */
 
     public NativeProtobufSchema loadNative(File f) throws IOException {
+        Objects.requireNonNull(f);
         return NativeProtobufSchema.construct(_loadNative(f));
     }
 
     public NativeProtobufSchema loadNative(URL url) throws IOException {
+        Objects.requireNonNull(url);
         return NativeProtobufSchema.construct(_loadNative(url));
     }
 
     public NativeProtobufSchema parseNative(String schema) throws IOException {
+        Objects.requireNonNull(schema);
         return NativeProtobufSchema.construct(_loadNative(schema));
     }
 
     public NativeProtobufSchema loadNative(InputStream in, boolean close) throws IOException {
+        Objects.requireNonNull(in);
         return NativeProtobufSchema.construct(_loadNative(in, close));
     }
 
     protected NativeProtobufSchema loadNative(Reader r, boolean close) throws IOException {
+        Objects.requireNonNull(r);
         return NativeProtobufSchema.construct(_loadNative(r, close));
     }
 

protobuf/src/main/resources/descriptor.proto renamed to protobuf/src/main/resources/tools/jackson/dataformat/protobuf/schema/descriptor.proto

@@ -318,7 +318,7 @@ public String toString() {
 
     // // // POJOs for "JVM-serializers" case
 
-    protected static class  MediaItem
+    public static class  MediaItem
     {
          public Media media;
          public List<Image> images;
@@ -375,9 +375,9 @@ public boolean equals(Object o) {
          }
     }
 
-    enum Size { SMALL, LARGE };
+    public enum Size { SMALL, LARGE };
 
-    static class Image
+    public static class Image
     {
         public Image() { }
         public Image(String uri, String title, int w, int h, Size s) {
@@ -410,9 +410,9 @@ && _equals(size, other.size)
         }
     }
 
-    enum Player { JAVA, FLASH; }
+    public enum Player { JAVA, FLASH; }
 
-    static class Media {
+    public static class Media {
 
         public String uri;
         public String title;        // Can be unset.

protobuf/src/test/java/tools/jackson/dataformat/protobuf/ProtobufTestBase.java

@@ -20,11 +20,11 @@
  */
 public class DeepNestingProtobufParserTest extends ProtobufTestBase
 {
-    static class Node {
+    public static class Node {
         public int id;
         public Node next;
 
-        protected Node() { }
+        public Node() { }
         public Node(int id, Node next) {
             this.id = id;
             this.next = next;