refactored TagWorkers and CssAppliers

DEVSIX-1055

Author: michaeldemey

src/main/java/com/itextpdf/html2pdf/attach/ITagWorkerFactory.java

@@ -52,11 +52,7 @@ public interface ITagWorkerFactory {
     /**
      * Look up a TagProcessor for the given tag and returns an instance constructed with passed parameters.
      */
-    ITagWorker getTagWorkerInstance(IElementNode tag, ProcessorContext context) ;
-
-    void registerTagWorker(String tag, Class<?> tagWorkerClass);
-
-    void registerTagWorker(String tag, String display, Class<?> tagWorkerClass);
+    ITagWorker getTagWorker(IElementNode tag, ProcessorContext context) ;
 
 }
 

src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultHtmlProcessor.java

@@ -234,7 +234,7 @@ private void visit(INode node) {
                 return;
             }
 
-            ITagWorker tagWorker = context.getTagWorkerFactory().getTagWorkerInstance(element, context);
+            ITagWorker tagWorker = context.getTagWorkerFactory().getTagWorker(element, context);
             if (tagWorker == null) {
                 if (!ignoredTags.contains(element.name())) {
                     logger.error(MessageFormat.format(LogMessageConstant.NO_WORKER_FOUND_FOR_TAG, (element).name()));

src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultTagWorkerFactory.java

@@ -55,43 +55,36 @@ This file is part of the iText (R) project.
 public class DefaultTagWorkerFactory implements ITagWorkerFactory {
 
     private TagProcessorMapping defaultMapping;
-    private TagProcessorMapping userMapping;
 
     public DefaultTagWorkerFactory() {
-        defaultMapping = DefaultTagWorkerMapping.getDefaultTagWorkerMapping();
-        userMapping = new TagProcessorMapping();
+        this.defaultMapping = DefaultTagWorkerMapping.getDefaultTagWorkerMapping();
     }
 
     @Override
-    public ITagWorker getTagWorkerInstance(IElementNode tag, ProcessorContext context) throws TagWorkerInitializationException {
-        Class<?> tagWorkerClass = getTagWorkerClass(userMapping, tag);
-        if (tagWorkerClass == null) {
-            tagWorkerClass = getTagWorkerClass(defaultMapping, tag);
-        }
-        if (tagWorkerClass == null) {
-            return null;
+    public final ITagWorker getTagWorker(IElementNode tag, ProcessorContext context) {
+        ITagWorker tagWorker = getCustomTagWorker(tag, context);
+
+        if ( tagWorker == null ) {
+            Class<?> tagWorkerClass = getTagWorkerClass(this.defaultMapping, tag);
+
+            if (tagWorkerClass == null) {
+                return null;
+            }
+
+            // Use reflection to create an instance
+            try {
+                Constructor ctor = tagWorkerClass.getDeclaredConstructor(new Class<?>[]{IElementNode.class, ProcessorContext.class});
+                ITagWorker res = (ITagWorker) ctor.newInstance(new Object[]{tag, context});
+                return res;
+            } catch (Exception e) {
+                throw new TagWorkerInitializationException(TagWorkerInitializationException.REFLECTION_IN_TAG_WORKER_FACTORY_IMPLEMENTATION_FAILED, tagWorkerClass.getName(), tag.name());
+            }
         }
-        // Use reflection to create an instance
-        try {
-            Constructor ctor = tagWorkerClass.getDeclaredConstructor(new Class<?>[]{IElementNode.class, ProcessorContext.class});
-            ITagWorker res = (ITagWorker) ctor.newInstance(new Object[]{tag, context});
-            return res;
-        } catch (Exception e) {
-            throw new TagWorkerInitializationException(TagWorkerInitializationException.REFLECTION_IN_TAG_WORKER_FACTORY_IMPLEMENTATION_FAILED, tagWorkerClass.getName(), tag.name());
-        }
-    }
 
-    @Override
-    public void registerTagWorker(String tag, Class<?> tagWorkerClass) {
-        userMapping.putMapping(tag, tagWorkerClass);
+        return tagWorker;
     }
 
-    @Override
-    public void registerTagWorker(String tag, String display, Class<?> tagWorkerClass) {
-        userMapping.putMapping(tag, display, tagWorkerClass);
-    }
-
-    private static Class<?> getTagWorkerClass(TagProcessorMapping mapping, IElementNode tag) {
+    private Class<?> getTagWorkerClass(TagProcessorMapping mapping, IElementNode tag) {
         Class<?> tagWorkerClass = null;
         String display = tag.getStyles() != null ? tag.getStyles().get(CssConstants.DISPLAY) : null;
         if (display != null) {
@@ -103,4 +96,14 @@ private static Class<?> getTagWorkerClass(TagProcessorMapping mapping, IElementN
         return tagWorkerClass;
     }
 
+    /**
+     * This is a hook method. Users wanting to provide a custom mapping or introduce their own ITagWorkers should implement this method.
+     *
+     * @param tag
+     * @param context
+     * @return
+     */
+    public ITagWorker getCustomTagWorker(IElementNode tag, ProcessorContext context) {
+        return null;
+    }
 }

src/main/java/com/itextpdf/html2pdf/css/apply/ICssApplierFactory.java

@@ -48,8 +48,4 @@ public interface ICssApplierFactory {
 
     ICssApplier getCssApplier(IElementNode tag);
 
-    void registerCssApplier(String tag, Class<?> applierToUse);
-
-    void registerCssApplier(String tag, String display, Class<?> applierToUse);
-
 }

src/main/java/com/itextpdf/html2pdf/css/apply/impl/DefaultCssApplierFactory.java

@@ -52,38 +52,31 @@ This file is part of the iText (R) project.
 public class DefaultCssApplierFactory implements ICssApplierFactory {
 
     private TagProcessorMapping defaultMapping;
-    private TagProcessorMapping userMapping;
 
     public DefaultCssApplierFactory() {
         defaultMapping = DefaultTagCssApplierMapping.getDefaultCssApplierMapping();
-        userMapping = new TagProcessorMapping();
     }
 
     @Override
-    public ICssApplier getCssApplier(IElementNode tag) {
-        Class<?> cssApplierClass = getCssApplierClass(userMapping, tag);
-        if (cssApplierClass == null) {
-            cssApplierClass = getCssApplierClass(defaultMapping, tag);
-        }
-        if (cssApplierClass == null) {
-            return null;
-        }
-        // Use reflection to create an instance
-        try {
-            return (ICssApplier) cssApplierClass.newInstance();
-        } catch (Exception e) {
-            throw new CssApplierInitializationException(CssApplierInitializationException.ReflectionFailed, cssApplierClass.getName(), tag.name());
+    public final ICssApplier getCssApplier(IElementNode tag) {
+        ICssApplier cssApplier = getCustomCssApplier(tag);
+
+        if (cssApplier == null) {
+            Class<?> cssApplierClass = getCssApplierClass(defaultMapping, tag);
+            if ( cssApplierClass != null ) {
+                try {
+                    return (ICssApplier) cssApplierClass.newInstance();
+                } catch (Exception e) {
+                    throw new CssApplierInitializationException(CssApplierInitializationException.ReflectionFailed, cssApplierClass.getName(), tag.name());
+                }
+            }
         }
-    }
 
-    @Override
-    public void registerCssApplier(String tag, Class<?> classToRegister) {
-        userMapping.putMapping(tag, classToRegister);
+        return cssApplier;
     }
 
-    @Override
-    public void registerCssApplier(String tag, String display, Class<?> applierToUse) {
-        userMapping.putMapping(tag, display, applierToUse);
+    public ICssApplier getCustomCssApplier(IElementNode tag) {
+        return null;
     }
 
     private static Class<?> getCssApplierClass(TagProcessorMapping mapping, IElementNode tag) {