HHH-10458 - Better encapsulate SchemaManagementTool (OGM) - unify JPA…

… schema generation and hbm2ddl capabilities;

HHH-10487 - Add @Incubating annotation

hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.java

@@ -11,14 +11,19 @@
 import org.hibernate.service.Service;
 
 /**
- * Contract for extracting statements from <i>import.sql</i> script.
+ * Contract for extracting statements from source/import/init scripts.
  *
  * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
+ *
+ * @see org.hibernate.cfg.AvailableSettings#HBM2DDL_IMPORT_FILES
+ * @see org.hibernate.cfg.AvailableSettings#HBM2DDL_LOAD_SCRIPT_SOURCE
+ * @see org.hibernate.cfg.AvailableSettings#HBM2DDL_CREATE_SCRIPT_SOURCE
+ * @see org.hibernate.cfg.AvailableSettings#HBM2DDL_DROP_SCRIPT_SOURCE
  */
 public interface ImportSqlCommandExtractor extends Service {
 	/**
 	 * @param reader Character stream reader of SQL script.
 	 * @return List of single SQL statements. Each command may or may not contain semicolon at the end.
 	 */
-	public String[] extractCommands(Reader reader);
+	String[] extractCommands(Reader reader);
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java

@@ -6,7 +6,6 @@
  */
 package org.hibernate.tool.schema;
 
-import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.internal.util.StringHelper;
 
 /**
@@ -77,17 +76,15 @@ public enum Action {
 		this.externalHbm2ddlName = externalHbm2ddlName;
 	}
 
-	public boolean isValidJpaAction() {
-		return externalJpaName != null;
-	}
-
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() + "(externalJpaName=" + externalJpaName + ", externalHbm2ddlName=" + externalHbm2ddlName + ")";
 	}
 
 	/**
-	 * Used when processing JPA configuration to interpret the user config values.
+	 * Used when processing JPA configuration to interpret the user config values.  Generally
+	 * this will be a value specified by {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_DATABASE_ACTION}
+	 * or {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_SCRIPTS_ACTION}
 	 *
 	 * @param value The encountered config value
 	 *
@@ -136,7 +133,7 @@ public static Action interpretJpaSetting(Object value) {
 	}
 
 	/**
-	 * Used when processing JPA configuration to interpret the user config values.
+	 * Used to interpret the value of {@link org.hibernate.cfg.AvailableSettings#HBM2DDL_AUTO}
 	 *
 	 * @param value The encountered config value
 	 *

hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java

@@ -52,7 +52,7 @@ public enum SourceType {
 
 	private final String externalName;
 
-	private SourceType(String externalName) {
+	SourceType(String externalName) {
 		this.externalName = externalName;
 	}
 

hibernate-core/src/main/java/org/hibernate/tool/schema/TargetType.java

@@ -7,6 +7,11 @@
 package org.hibernate.tool.schema;
 
 /**
+ * Describes the allowable targets (SPI wise) for schema management actions.
+ * <p/>
+ * Under the covers corresponds to provider-specific implementations of
+ * {@link org.hibernate.tool.schema.internal.exec.GenerationTarget}
+ *
  * @author Steve Ebersole
  */
 public enum TargetType {
@@ -19,7 +24,7 @@ public enum TargetType {
 	 */
 	SCRIPT,
 	/**
-	 * Write to System.out
+	 * Write to {@link System#out}
 	 */
 	STDOUT;
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java

@@ -19,7 +19,6 @@
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.tool.schema.Action;
 import org.hibernate.tool.schema.extract.spi.DatabaseInformation;
 import org.hibernate.tool.schema.internal.exec.ImprovedDatabaseInformationImpl;
 import org.hibernate.tool.schema.internal.exec.JdbcConnectionContext;
@@ -35,33 +34,13 @@
 import org.jboss.logging.Logger;
 
 /**
+ * Helper methods.
+ *
  * @author Steve Ebersole
  */
 public class Helper {
 	private static final Logger log = Logger.getLogger( Helper.class );
 
-	public static boolean includesCreate(ActionGrouping actions) {
-		return includesCreate( actions.getDatabaseAction() )
-				|| includesCreate( actions.getScriptAction() );
-	}
-
-	public static boolean includesCreate(Action action) {
-		return action == Action.CREATE_ONLY
-				|| action == Action.CREATE
-				|| action == Action.CREATE_DROP;
-	}
-
-	private static boolean includesDrop(ActionGrouping actions) {
-		return includesDrop( actions.getDatabaseAction() )
-				|| includesDrop( actions.getScriptAction() );
-	}
-
-	public static boolean includesDrop(Action action) {
-		return action == Action.DROP
-				|| action == Action.CREATE
-				|| action == Action.CREATE_DROP;
-	}
-
 	public static ScriptSourceInput interpretScriptSourceSetting(Object scriptSourceSetting, ClassLoaderService classLoaderService) {
 		if ( Reader.class.isInstance( scriptSourceSetting ) ) {
 			return new ScriptSourceInputFromReader( (Reader) scriptSourceSetting );
@@ -155,5 +134,4 @@ public static DatabaseInformation buildDatabaseInformation(
 			throw jdbcEnvironment.getSqlExceptionHelper().convert( e, "Unable to build DatabaseInformation" );
 		}
 	}
-
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java

@@ -15,13 +15,16 @@
 import org.hibernate.tool.schema.spi.ScriptSourceInput;
 
 /**
+ * Convenience base class for ScriptSourceInput implementations
+ *
  * @author Steve Ebersole
  */
 public abstract class AbstractScriptSourceInput implements ScriptSourceInput {
 	protected abstract Reader reader();
 
 	@Override
 	public void prepare() {
+		// by default there is nothing to do
 	}
 
 	@Override
@@ -37,5 +40,6 @@ public List<String> read(ImportSqlCommandExtractor commandExtractor) {
 
 	@Override
 	public void release() {
+		// by default there is nothing to do
 	}
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/CommandAcceptanceException.java

@@ -9,6 +9,8 @@
 import org.hibernate.HibernateException;
 
 /**
+ * Indicates a problem accepting/executing a schema management command.
+ *
  * @author Steve Ebersole
  */
 public class CommandAcceptanceException extends HibernateException {

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/Exporter.java

@@ -13,6 +13,8 @@
 /**
  * Defines a contract for exporting of database objects (tables, sequences, etc) for use in SQL {@code CREATE} and
  * {@code DROP} scripts.
+ * <p/>
+ * This is an ORM-centric contract
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/JpaTargetAndSourceDescriptor.java

@@ -13,5 +13,5 @@
  *
  * @author Steve Ebersole
  */
-public interface JpaTargetAndSourceDescriptor extends TargetDescriptor, SourceDescriptor {
+public interface JpaTargetAndSourceDescriptor extends SourceDescriptor, TargetDescriptor {
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementException.java

@@ -12,8 +12,7 @@
  * Indicates a problem in performing schema management.
  * <p/>
  * Specifically this represents a a problem of an infrastructural-nature.  For
- * representing problems applying a specific command see
- * {@link CommandAcceptanceException}
+ * problems applying a specific command see {@link CommandAcceptanceException}
  *
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java

@@ -15,16 +15,18 @@
 import org.hibernate.tool.schema.Action;
 import org.hibernate.tool.schema.SourceType;
 import org.hibernate.tool.schema.TargetType;
-import org.hibernate.tool.schema.internal.ActionGrouping;
 import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl;
 import org.hibernate.tool.schema.internal.Helper;
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_CREATE_SCRIPT_SOURCE;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_CREATE_SOURCE;
+import static org.hibernate.cfg.AvailableSettings.HBM2DDL_DATABASE_ACTION;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_DROP_SCRIPT_SOURCE;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_DROP_SOURCE;
+import static org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_ACTION;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_CREATE_TARGET;
 import static org.hibernate.cfg.AvailableSettings.HBM2DDL_SCRIPTS_DROP_TARGET;
 
@@ -440,4 +442,43 @@ public Object getScriptTargetSetting(Map configurationValues) {
 			return configurationValues.get( HBM2DDL_SCRIPTS_CREATE_TARGET );
 		}
 	}
+
+	/**
+	 * For JPA-style schema-gen, database and script target handing are configured
+	 * individually - this tuple allows interpreting the the action for both targets
+	 * simultaneously
+	 */
+	public static class ActionGrouping {
+		private final Action databaseAction;
+		private final Action scriptAction;
+
+		public ActionGrouping(Action databaseAction, Action scriptAction) {
+			this.databaseAction = databaseAction;
+			this.scriptAction = scriptAction;
+		}
+
+		public Action getDatabaseAction() {
+			return databaseAction;
+		}
+
+		public Action getScriptAction() {
+			return scriptAction;
+		}
+
+		public static ActionGrouping interpret(Map configurationValues) {
+			// interpret the JPA settings first
+			Action databaseAction = Action.interpretJpaSetting( configurationValues.get( HBM2DDL_DATABASE_ACTION ) );
+			Action scriptAction = Action.interpretJpaSetting( configurationValues.get( HBM2DDL_SCRIPTS_ACTION ) );
+
+			// if no JPA settings were specified, look at the legacy HBM2DDL_AUTO setting...
+			if ( databaseAction == Action.NONE && scriptAction == Action.NONE ) {
+				final Action hbm2ddlAutoAction = Action.interpretHbm2ddlSetting( configurationValues.get( HBM2DDL_AUTO ) );
+				if ( hbm2ddlAutoAction != Action.NONE ) {
+					databaseAction = hbm2ddlAutoAction;
+				}
+			}
+
+			return new ActionGrouping( databaseAction, scriptAction );
+		}
+	}
 }

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SourceDescriptor.java

@@ -31,7 +31,11 @@ public interface SourceDescriptor {
 
 	/**
 	 * If {@link #getSourceType()} indicates scripts are involved, returns
-	 * a representation of the script file to read.  Otherwise, returns {@code null}
+	 * a representation of the script file to read.  Otherwise, returns {@code null}.
+	 * <p/>
+	 * While it is ultimately up to the actual tooling provider, it is generally an error
+	 * for {@link #getSourceType()} to indicate that scripts are involved and for this
+	 * method to return {@code null}.
 	 *
 	 * @return The script file to read.
 	 */

hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TargetDescriptor.java

@@ -33,8 +33,9 @@ public interface TargetDescriptor {
 	 * If {@link #getTargetTypes()} includes scripts, return a representation
 	 * of the script file to write to.  Otherwise, returns {@code null}.
 	 * <p/>
-	 * If {@link #getTargetTypes()} includes scripts, and this method returns
-	 * {@code null} an exception will be thrown interpreting this descriptor
+	 * While it is ultimately up to the actual tooling provider, it is generally an error
+	 * for {@link #getTargetTypes()} to indicate that scripts are a target and for this
+	 * method to return {@code null}.
 	 *
 	 * @return The script output target
 	 */