Factorize some more code

Signed-off-by: Francis Galiegue <[email protected]>

Author: fge

src/main/java/com/github/fge/jsonschema/processors/walk/DraftV4PointerCollectorDictionary.java

@@ -19,10 +19,8 @@
 
 import com.github.fge.jsonschema.library.Dictionary;
 import com.github.fge.jsonschema.library.DictionaryBuilder;
-import com.github.fge.jsonschema.processors.walk.draftv4.AllOfPointerCollector;
-import com.github.fge.jsonschema.processors.walk.draftv4.AnyOfPointerCollector;
 import com.github.fge.jsonschema.processors.walk.draftv4.NotPointerCollector;
-import com.github.fge.jsonschema.processors.walk.draftv4.OneOfPointerCollector;
+import com.github.fge.jsonschema.processors.walk.helpers.SchemaArrayPointerCollector;
 import com.github.fge.jsonschema.processors.walk.helpers.SchemaMapPointerCollector;
 
 public final class DraftV4PointerCollectorDictionary
@@ -43,11 +41,11 @@ private DraftV4PointerCollectorDictionary()
         PointerCollector collector;
 
         keyword = "allOf";
-        collector = AllOfPointerCollector.getInstance();
+        collector = new SchemaArrayPointerCollector(keyword);
         builder.addEntry(keyword, collector);
 
         keyword = "anyOf";
-        collector = AnyOfPointerCollector.getInstance();
+        collector = new SchemaArrayPointerCollector(keyword);
         builder.addEntry(keyword, collector);
 
         keyword = "definitions";
@@ -59,7 +57,7 @@ private DraftV4PointerCollectorDictionary()
         builder.addEntry(keyword, collector);
 
         keyword = "oneOf";
-        collector = OneOfPointerCollector.getInstance();
+        collector = new SchemaArrayPointerCollector(keyword);
         builder.addEntry(keyword, collector);
 
         DICTIONARY = builder.freeze();

src/main/java/com/github/fge/jsonschema/processors/walk/draftv4/AllOfPointerCollector.java

@@ -22,15 +22,16 @@
 
 import java.util.Collection;
 
-public abstract class SchemaArrayPointerCollector
+public final class SchemaArrayPointerCollector
     extends AbstractPointerCollector
 {
-    protected SchemaArrayPointerCollector(final String keyword) {
+    public SchemaArrayPointerCollector(final String keyword)
+    {
         super(keyword);
     }
 
     @Override
-    public final void collect(final Collection<JsonPointer> pointers,
+    public void collect(final Collection<JsonPointer> pointers,
         final SchemaTree tree)
     {
         final int size = getNode(tree).size();