OGM-770 Adapting to latest ORM changes

Author: gunnarmorling

cassandra/src/main/java/org/hibernate/ogm/datastore/cassandra/impl/CassandraSchemaDefiner.java

@@ -12,7 +12,7 @@
 import java.util.Set;
 
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.Schema;
+import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.ForeignKey;
@@ -45,8 +45,8 @@ public void initializeSchema(Database database, SessionFactoryImplementor sessio
 			sequenceHandler.createSequence( identifierGenerator.getGeneratorKeyMetadata(), datastoreProvider );
 		}
 
-		for ( Schema schema : database.getSchemas() ) {
-			for ( Table table : schema.getTables() ) {
+		for ( Namespace namespace : database.getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
 				if ( table.isPhysicalTable() ) {
 					processTable( sessionFactoryImplementor, datastoreProvider, table );
 				}

core/src/main/java/org/hibernate/ogm/hibernatecore/impl/OgmSessionBuilderDelegator.java

@@ -7,7 +7,7 @@
 package org.hibernate.ogm.hibernatecore.impl;
 
 import org.hibernate.Session;
-import org.hibernate.engine.spi.ForwardingSessionBuilderImplementor;
+import org.hibernate.engine.spi.AbstractDelegatingSessionBuilderImplementor;
 import org.hibernate.engine.spi.SessionBuilderImplementor;
 import org.hibernate.engine.spi.SessionOwner;
 import org.hibernate.event.spi.EventSource;
@@ -22,7 +22,7 @@
 /**
  * @author Emmanuel Bernard <emmanuel@hibernate.org>
  */
-public class OgmSessionBuilderDelegator extends ForwardingSessionBuilderImplementor implements OgmSessionBuilderImplementor {
+public class OgmSessionBuilderDelegator extends AbstractDelegatingSessionBuilderImplementor implements OgmSessionBuilderImplementor {
 
 	private final SessionBuilderImplementor builder;
 	private final OgmSessionFactory factory;

core/src/main/java/org/hibernate/ogm/hibernatecore/impl/OgmSharedSessionBuilderDelegator.java

@@ -7,15 +7,15 @@
 package org.hibernate.ogm.hibernatecore.impl;
 
 import org.hibernate.SharedSessionBuilder;
-import org.hibernate.engine.spi.ForwardingSharedSessionBuilder;
+import org.hibernate.engine.spi.AbstractDelegatingSharedSessionBuilder;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.ogm.OgmSession;
 import org.hibernate.ogm.OgmSessionFactory;
 
 /**
  * @author Emmanuel Bernard <emmanuel@hibernate.org>
  */
-public class OgmSharedSessionBuilderDelegator extends ForwardingSharedSessionBuilder implements SharedSessionBuilder {
+public class OgmSharedSessionBuilderDelegator extends AbstractDelegatingSharedSessionBuilder implements SharedSessionBuilder {
 	private final SharedSessionBuilder builder;
 	private final OgmSessionFactory factory;
 

core/src/test/java/org/hibernate/ogm/test/datastore/DatastoreProviderGeneratingSchema.java

@@ -9,7 +9,7 @@
 import java.util.Iterator;
 
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.Schema;
+import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
@@ -52,8 +52,8 @@ public static class TestSchemaDefiner extends BaseSchemaDefiner {
 
 		@Override
 		public void initializeSchema(Database database, SessionFactoryImplementor factory) {
-			for ( Schema schema : database.getSchemas() ) {
-				for (Table table : schema.getTables() ) {
+			for ( Namespace namespace : database.getNamespaces() ) {
+				for (Table table : namespace.getTables() ) {
 					if ( table.isPhysicalTable() ) {
 						String tableName = table.getQuotedName();
 						// do something with table

neo4j/src/main/java/org/hibernate/ogm/datastore/neo4j/impl/Neo4jSchemaDefiner.java

@@ -14,7 +14,7 @@
 import java.util.Set;
 
 import org.hibernate.boot.model.relational.Database;
-import org.hibernate.boot.model.relational.Schema;
+import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.mapping.Column;
@@ -99,8 +99,8 @@ private void createEntityConstraints(GraphDatabaseService neo4jDb, Database data
 	}
 
 	private void addUniqueConstraints(GraphDatabaseService neo4jDb, Database database) {
-		for ( Schema schema : database.getSchemas() ) {
-			for ( Table table : schema.getTables() ) {
+		for ( Namespace namespace : database.getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
 				if ( table.isPhysicalTable() ) {
 					Label label = label( table.getName() );
 					PrimaryKey primaryKey = table.getPrimaryKey();