jaxb2-plugins: style

Signed-off-by: Ketoth Xupack <ketoth.xupack@gmail.com>
no-hope · Oct 17, 2013 · c994eff · c994eff
1 parent 3a19623
commit c994eff
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 22 deletions.
diff --git a/...ects/jaxb2-plugins/src/main/java/org/nohope/jaxb2/plugin/validation/ValidationPlugin.java b/...ects/jaxb2-plugins/src/main/java/org/nohope/jaxb2/plugin/validation/ValidationPlugin.java
@@ -17,7 +17,6 @@
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
 import org.jvnet.jaxb2_commons.util.ClassUtils;
-import org.jvnet.jaxb2_commons.util.CustomizationUtils;
 import org.nohope.typetools.TStr;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -37,6 +36,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.jvnet.jaxb2_commons.util.CustomizationUtils.containsCustomization;
+import static org.jvnet.jaxb2_commons.util.CustomizationUtils.findCustomization;
 import static org.nohope.jaxb2.plugin.validation.Customizations.*;
 
 /**
@@ -56,15 +57,14 @@ public String getUsage() {
         return "TBD";
     }
 
+
+
     @Override
-    public void postProcessModel(final Model model,
-                                 final ErrorHandler errorHandler) {
-        final boolean containsModelLevel =
-                CustomizationUtils.containsCustomization(model, Customizations.BINDINGS);
+    public void postProcessModel(final Model model, final ErrorHandler errorHandler) {
+        final boolean containsModelLevel = containsCustomization(model, BINDINGS);
 
         if (containsModelLevel) {
-            final CPluginCustomization customization =
-                    CustomizationUtils.findCustomization(model, Customizations.BINDINGS);
+            final CPluginCustomization customization = findCustomization(model, BINDINGS);
             final NodeList childNodes = customization.element.getChildNodes();
             for (int i = 0; i < childNodes.getLength(); i++) {
                 final Node item = childNodes.item(i);
@@ -79,13 +79,10 @@ public void postProcessModel(final Model model,
         }
 
         for (final CClassInfo classInfo : model.beans().values()) {
-            final boolean containsClassLevel =
-                    CustomizationUtils.containsCustomization(classInfo, Customizations.BIND);
+            final boolean containsClassLevel = containsCustomization(classInfo, BIND);
 
             if (containsClassLevel) {
-                final CPluginCustomization customization =
-                        CustomizationUtils.findCustomization(classInfo, Customizations.BIND);
-
+                final CPluginCustomization customization = findCustomization(classInfo, BIND);
                 final Element element = validateBindElement(customization.element, false, errorHandler, classInfo);
                 final Element validationNode = getValidationNode(element, errorHandler, classInfo);
                 addValidator(validationNode, classInfo, errorHandler, model);
@@ -250,8 +247,6 @@ protected boolean run(final Outline outline,
 
     @Override
     public Collection<QName> getCustomizationElementNames() {
-        return Arrays.asList(Customizations.BINDINGS,
-                Customizations.BIND,
-                VALIDATOR);
+        return Arrays.asList(BINDINGS, BIND, VALIDATOR);
     }
 }
diff --git a/projects/jaxb2-plugins/src/test/java/org/nohope/jaxb2/plugin/Jaxb2PluginTestSupport.java b/projects/jaxb2-plugins/src/test/java/org/nohope/jaxb2/plugin/Jaxb2PluginTestSupport.java
@@ -2,6 +2,7 @@
 
 import org.junit.Test;
 import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo;
+import org.jvnet.jaxb2.maven2.ResourceEntry;
 import org.nohope.ITranslator;
 import org.nohope.logging.Logger;
 import org.nohope.logging.LoggerFactory;
@@ -34,6 +35,8 @@
 public abstract class Jaxb2PluginTestSupport implements InstanceTestSetupListener {
     static final Logger LOG = LoggerFactory.getLogger("jaxb2-testing");
     private static final Slf4jToMavenLogAdapter MVN_LOGGER = new Slf4jToMavenLogAdapter(LOG);
+    private static final String TEST_RESOURCES_PATH = "src/test/resources/";
+
 
     //static {
     //    System.setProperty("javax.xml.accessExternalStylesheet", "all");
@@ -44,32 +47,38 @@ public abstract class Jaxb2PluginTestSupport implements InstanceTestSetupListene
     private final String arg;
     private final String resources;
     private final String classpath;
+    private final List<String> bindings = new ArrayList<>();
 
     public Jaxb2PluginTestSupport(final String arg,
                                   final String resources,
-                                  final String classpath) {
+                                  final String classpath,
+                                  final String... bindings) {
         this.arg = arg;
         this.resources = resources;
         this.classpath = classpath;
+        this.bindings.addAll(Arrays.asList(bindings));
     }
 
     public Jaxb2PluginTestSupport(final String arg,
-                                  final String resources) {
+                                  final String resources,
+                                  final String... bindings) {
         this.arg = arg;
-        this.resources = "src/test/resources/" + resources;
+
+        this.resources = TEST_RESOURCES_PATH + resources;
         this.classpath = null;
+        this.bindings.addAll(Arrays.asList(bindings));
     }
 
     private String getClasspath() {
         return classpath != null
                 ? classpath
-                : resources.replace("src/test/resources/", "").replace("/", ".");
+                : resources.replace(TEST_RESOURCES_PATH, "").replace("/", ".");
     }
 
     private String getClasspathPath() {
         return classpath != null
                 ? classpath
-                : resources.replace("src/test/resources/", "");
+                : resources.replace(TEST_RESOURCES_PATH, "");
     }
 
     @Override
@@ -208,6 +217,16 @@ protected void configureMojo(final AbstractXJC2Mojo mojo) {
                 mojo.setVerbose(true);
                 mojo.setDebug(true);
             }
+
+            if (!bindings.isEmpty()) {
+                final List<ResourceEntry> entries = new ArrayList<>();
+                for (final String binding : bindings) {
+                    final ResourceEntry entry = new ResourceEntry();
+                    entry.setUrl("file://" + getBaseDir().getAbsolutePath() + "/" + resources + "/" + binding);
+                    entries.add(entry);
+                }
+                mojo.setBindings(entries.toArray(new ResourceEntry[entries.size()]));
+            }
         }
 
         @Override
@@ -216,7 +235,6 @@ public List<String> getArgs() {
             args.add("-X" + arg);
             return args;
         }
-
     }
 
     protected void validateBuildFailure(final Exception e) throws Exception {

diff --git a/...ects/jaxb2-plugins/src/test/java/org/nohope/jaxb2/plugin/metadata/MetadataPluginTest.java b/...ects/jaxb2-plugins/src/test/java/org/nohope/jaxb2/plugin/metadata/MetadataPluginTest.java
@@ -22,7 +22,7 @@ public class MetadataPluginTest extends Jaxb2PluginTestSupport {
     public MetadataPluginTest() {
         super("metadata",
               "src/test/resources/org/nohope/jaxb2/codegen/metadata",
-               "org/nohope/jaxb_codegen/metadata");
+               "org/nohope/jaxb_codegen/metadata", new String[0]);
     }
 
     @Test