Implement new (static) method in Reader.

+ Improve test to print out unmasked methods.

2 files changed, 6 insertions, 2 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
index f66d6f0defc..2cfc45c784c 100644
--- a/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
+++ b/vespajlib/src/main/java/com/yahoo/io/reader/NamedReader.java
@@ -36,6 +36,7 @@ public class NamedReader extends Reader {
     }
 
     // The rest is reader method implementations which delegates to the wrapped reader
+    public static Reader nullReader() { return new NamedReader("nullReader", Reader.nullReader()); }
     @Override
     public int read(CharBuffer charBuffer) throws IOException { return reader.read(charBuffer); }
     @Override
diff --git a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
index 3bbbf3ea7de..6eb23277075 100644
--- a/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/io/reader/NamedReaderTestCase.java
@@ -13,6 +13,7 @@ import com.yahoo.protect.ClassValidator;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * Tests all method of NamedReader.
@@ -35,8 +36,10 @@ public class NamedReaderTestCase {
 
     @Test
     public void testMethodMasking() {
-        assertEquals(0,
-                     ClassValidator.unmaskedMethodsFromSuperclass(NamedReader.class).size());
+        List<Method> unmaskedMethods = ClassValidator.unmaskedMethodsFromSuperclass(NamedReader.class);
+        if (! unmaskedMethods.isEmpty()) {
+            fail("Unmasked methods in " + NamedReader.class.getName() + ": " + unmaskedMethods);
+        }
     }
 
     private static class MarkerReader extends Reader {