The plugin now scans for annotated classes in dependencies too

[hibernate4-maven-plugin] / src / main / java / de / juplo / plugins / hibernate4 / Hbm2DdlMojo.java

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index f991253..83f53d3 100644 (file)
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -47,9 +47,12 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -85,7 +88,10 @@ public class Hbm2DdlMojo extends AbstractMojo
   public final static String NAMING_STRATEGY="hibernate.ejb.naming_strategy";
   public final static String ENVERS = "hibernate.export.envers";
 
-  private final static String MD5S = "schema.md5s";
+  public final static String MD5S = "schema.md5s";
+
+  private final static Pattern split = Pattern.compile("[^,\\s]+");
+
 
   /**
    * The maven project.
@@ -129,6 +135,21 @@ public class Hbm2DdlMojo extends AbstractMojo
    */
   private boolean scanTestClasses;
 
+  /**
+   * Dependency-Scopes, that should be scanned for annotated classes.
+   * <p>
+   * By default, only dependencies in the scope <code>compile</code> are
+   * scanned for annotated classes. Multiple scopes can be seperated by
+   * white space or commas.
+   * <p>
+   * The plugin does not scan for annotated classes in transitive
+   * dependencies. If some of your annotated classes are hidden in a
+   * transitive dependency, you can simply add that dependency explicitly.
+   *
+   * @parameter property="hibernate.export.scan_dependencies" default-value="compile"
+   */
+  private String scanDependencies;
+
   /**
    * Test-Classes-Directory to scan.
    * <p>
@@ -153,7 +174,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * The excecution is skipped automatically, if no modified or newly added
    * annotated classes are found and the dialect was not changed.
    *
-   * @parameter property="hibernate.export.skip" default-value="false"
+   * @parameter property="maven.test.skip" default-value="false"
    */
   private boolean skip;
 
@@ -381,6 +402,34 @@ public class Hbm2DdlMojo extends AbstractMojo
           db.scanArchives(dirUrl);
         }
       }
+      if (scanDependencies != null)
+      {
+        Matcher matcher = split.matcher(scanDependencies);
+        while (matcher.find())
+        {
+          getLog().info("Scanning dependencies for scope " + matcher.group());
+          for (Artifact artifact : project.getDependencyArtifacts())
+          {
+            if (!artifact.getScope().equalsIgnoreCase(matcher.group()))
+              continue;
+            if (artifact.getFile() == null)
+            {
+              getLog().warn(
+                  "Cannot scan dependency " +
+                  artifact.getId() +
+                  ": no JAR-file available!"
+                  );
+              continue;
+            }
+            getLog().info(
+                "Scanning dependency " +
+                artifact.getId() +
+                " for annotated classes..."
+                );
+            db.scanArchives(artifact.getFile().toURI().toURL());
+          }
+        }
+      }
 
       Set<String> classNames = new HashSet<String>();
       if (db.getAnnotationIndex().containsKey(Entity.class.getName()))
@@ -508,10 +557,10 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             PASSWORD + "=" + properties.getProperty(PASSWORD) +
-            " with the value " + password
+            " with value " + password
           );
       else
-        getLog().debug("Using the value " + password);
+        getLog().debug("Using value " + password + " for property " + PASSWORD);
       properties.setProperty(PASSWORD, password);
     }
     if (hibernateDialect != null)
@@ -520,10 +569,12 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             DIALECT + "=" + properties.getProperty(DIALECT) +
-            " with the value " + hibernateDialect
+            " with value " + hibernateDialect
           );
       else
-        getLog().debug("Using the value " + hibernateDialect);
+        getLog().debug(
+            "Using value " + hibernateDialect + " for property " + DIALECT
+            );
       properties.setProperty(DIALECT, hibernateDialect);
     }
     if ( hibernateNamingStrategy != null )
@@ -532,10 +583,13 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +
-            " with the value " + hibernateNamingStrategy
+            " with value " + hibernateNamingStrategy
            );
       else
-        getLog().debug("Using the value " + hibernateNamingStrategy);
+        getLog().debug(
+            "Using value " + hibernateNamingStrategy + " for property " +
+            NAMING_STRATEGY
+            );
       properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
     }
 
@@ -547,15 +601,27 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug("SQL-dialect unchanged.");
       else
       {
-        getLog().debug("SQL-dialect changed: " + dialect);
         modified = true;
-        md5s.put(DIALECT, dialect);
+        if (dialect == null)
+        {
+          getLog().debug("SQL-dialect was unset.");
+          md5s.remove(DIALECT);
+        }
+        else
+        {
+          getLog().debug("SQL-dialect changed: " + dialect);
+          md5s.put(DIALECT, dialect);
+        }
       }
     }
     else
     {
-      modified = true;
-      md5s.put(DIALECT, properties.getProperty(DIALECT));
+      String dialect = properties.getProperty(DIALECT);
+      if (dialect != null)
+      {
+        modified = true;
+        md5s.put(DIALECT, properties.getProperty(DIALECT));
+      }
     }
 
     /** The generated SQL varies with the envers-configuration */