Further attempts to fix the build

Author: cowtowncoder

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

@@ -1,8 +1,8 @@
 // Protobuf Main artifact Module descriptor
 module tools.jackson.dataformat.protobuf
 {
-    requires tools.jackson.core;
-    requires tools.jackson.databind;
+    requires transitive tools.jackson.core;
+    requires transitive tools.jackson.databind;
 
     // No module-info nor Automatic-Module-Name; relies on jar name:
     requires protoparser;

protobuf/src/main/java/tools/jackson/dataformat/protobuf/ProtobufMapper.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Objects;
 import java.util.concurrent.locks.ReentrantLock;
 
 import tools.jackson.core.Version;
@@ -34,6 +35,13 @@ public Builder(ProtobufFactory f) {
             super(f);
         }
 
+        /**
+         * NOTE: while technically public, not intended for external use
+         * (since {@code StateImpl} is not public type)
+         *
+         * @param state State to restore to initialize constructed Builder
+         */
+        @SuppressWarnings("exports")
         public Builder(StateImpl state) {
             super(state);
         }
@@ -209,15 +217,15 @@ public ProtobufSchema generateSchemaFor(TypeReference<?> type) {
      */
 
     public FileDescriptorSet loadDescriptorSet(URL src) throws IOException {
-        return descriptorLoader().load(src);
+        return descriptorLoader().load(Objects.requireNonNull(src));
     }
 
     public FileDescriptorSet loadDescriptorSet(File src) throws IOException {
-        return descriptorLoader().load(src);
+        return descriptorLoader().load(Objects.requireNonNull(src));
     }
 
     public FileDescriptorSet loadDescriptorSet(InputStream src) throws IOException {
-        return descriptorLoader().load(src);
+        return descriptorLoader().load(Objects.requireNonNull(src));
     }
 
     /**

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

@@ -2,6 +2,7 @@
 
 import java.io.*;
 import java.net.URL;
+import java.util.Objects;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectReader;
@@ -67,27 +68,27 @@ public static DescriptorLoader construct(ObjectMapper mapper,
 
     public FileDescriptorSet load(URL src) throws IOException
     {
-        return _reader.readValue(src);
+        return _reader.readValue(Objects.requireNonNull(src));
     }
 
     public FileDescriptorSet load(File src) throws IOException
     {
-        return _reader.readValue(src);
+        return _reader.readValue(Objects.requireNonNull(src));
     }
 
     /**
      * Note: passed {@link java.io.InputStream} will be closed by this method.
      */
     public FileDescriptorSet load(InputStream in) throws IOException
     {
-        return _reader.readValue(in);
+        return _reader.readValue(Objects.requireNonNull(in));
     }
 
     /**
      * Note: passed {@link java.io.Reader} will be closed by this method.
      */
     public FileDescriptorSet load(Reader r) throws IOException
     {
-        return _reader.readValue(r);
+        return _reader.readValue(Objects.requireNonNull(r));
     }
 }

protobuf/src/test/java/tools/jackson/dataformat/protobuf/schema/DescriptorLoaderTest.java

@@ -28,7 +28,6 @@ public Main(Other o)
         }
     }
 
-
     static class Other
     {
         public int f;
@@ -68,7 +67,7 @@ public void testParsing() throws Exception
         // Deserialize the bytes using the descriptor
         // load main.desc descriptor file.  This file was created by protoc - o main.desc main.proto other.proto
         FileDescriptorSet fds;
-        try (InputStream in = this.getClass().getResourceAsStream("/main.desc")) {
+        try (InputStream in = this.getClass().getResourceAsStream("/test/main.desc")) {
             fds = MAPPER.loadDescriptorSet(in);
         }
         ProtobufSchema schema2 = fds.schemaFor("Main");