Projects information

Chunk

Conflicting content
public CurrentTenantIdentifierResolver getCurrentTenantIdentifierResolver(); /** <<<<<<< HEAD * Obtain the JPA Metamodel instance. * * @since 5.0 / public Metamodel getJpaMetamodel(); ======= Provides access to the named query repository * * @return */ public NamedQueryRepository getNamedQueryRepository(); >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 }

Conflicting content

	public CurrentTenantIdentifierResolver getCurrentTenantIdentifierResolver();

	/**
<<<<<<< HEAD
	 * Obtain the JPA Metamodel instance.
	 *
	 * @since 5.0
	 */
	public Metamodel getJpaMetamodel();
=======
	 * Provides access to the named query repository
	 *
	 * @return
	 */
	public NamedQueryRepository getNamedQueryRepository();
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
}

Solution content
public CurrentTenantIdentifierResolver getCurrentTenantIdentifierResolver(); /** * Obtain the JPA Metamodel instance. * * @since 5.0 / public Metamodel getJpaMetamodel(); /* * Provides access to the named query repository * * @return */ public NamedQueryRepository getNamedQueryRepository(); }

Solution content

	public CurrentTenantIdentifierResolver getCurrentTenantIdentifierResolver();

	/**
	 * Obtain the JPA Metamodel instance.
	 *
	 * @since 5.0
	 */
	public Metamodel getJpaMetamodel();
	/**
	 * Provides access to the named query repository
	 *
	 * @return
	 */
	public NamedQueryRepository getNamedQueryRepository();
}

File
SessionFactoryImplementor.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method interface

Chunk

Conflicting content
import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.IntegratorService; <<<<<<< HEAD ======= import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.secure.spi.JaccIntegrator; >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 /** * @author Steve Ebersole

Conflicting content

import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
<<<<<<< HEAD
=======
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.secure.spi.JaccIntegrator;
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8

/**
 * @author Steve Ebersole

Solution content
import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator; import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.IntegratorService; import org.hibernate.secure.spi.JaccIntegrator; /** * @author Steve Ebersole

Solution content

import org.hibernate.cfg.beanvalidation.BeanValidationIntegrator;
import org.hibernate.integrator.spi.Integrator;
import org.hibernate.integrator.spi.IntegratorService;
import org.hibernate.secure.spi.JaccIntegrator;

/**
 * @author Steve Ebersole

File
IntegratorServiceImpl.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content
collectionRolesByEntityParticipant = Collections.unmodifiableMap( tmpEntityToCollectionRoleMap ); //Named Queries: <<<<<<< HEAD namedQueries = new HashMap( cfg.getNamedQueries() ); namedSqlQueries = new HashMap( cfg.getNamedSQLQueries() ); sqlResultSetMappings = Collections.unmodifiableMap( new HashMap( cfg.getSqlResultSetMappings() ) ); ======= this.namedQueryRepository = new NamedQueryRepository( cfg.getNamedQueries().values(), cfg.getNamedSQLQueries().values(), cfg.getSqlResultSetMappings().values() ); >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 imports = new HashMap( cfg.getImports() ); // after all persisters and named queries are registered

Conflicting content

		collectionRolesByEntityParticipant = Collections.unmodifiableMap( tmpEntityToCollectionRoleMap );

		//Named Queries:
<<<<<<< HEAD
		namedQueries = new HashMap( cfg.getNamedQueries() );
		namedSqlQueries = new HashMap( cfg.getNamedSQLQueries() );
		sqlResultSetMappings = Collections.unmodifiableMap( new HashMap( cfg.getSqlResultSetMappings() ) );
=======
		this.namedQueryRepository = new NamedQueryRepository(
				cfg.getNamedQueries().values(),
				cfg.getNamedSQLQueries().values(),
				cfg.getSqlResultSetMappings().values()
		);
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
		imports = new HashMap( cfg.getImports() );

		// after *all* persisters and named queries are registered

Solution content
collectionRolesByEntityParticipant = Collections.unmodifiableMap( tmpEntityToCollectionRoleMap ); //Named Queries: this.namedQueryRepository = new NamedQueryRepository( cfg.getNamedQueries().values(), cfg.getNamedSQLQueries().values(), cfg.getSqlResultSetMappings().values() ); imports = new HashMap( cfg.getImports() ); // after all persisters and named queries are registered

Solution content

		collectionRolesByEntityParticipant = Collections.unmodifiableMap( tmpEntityToCollectionRoleMap );

		//Named Queries:
		this.namedQueryRepository = new NamedQueryRepository(
				cfg.getNamedQueries().values(),
				cfg.getNamedSQLQueries().values(),
				cfg.getSqlResultSetMappings().values()
		);
		imports = new HashMap( cfg.getImports() );

		// after *all* persisters and named queries are registered

File
SessionFactoryImpl.java

Developer's decision
Version 2

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content
//Named Queries: <<<<<<< HEAD namedQueries = new HashMap(); for ( NamedQueryDefinition namedQueryDefinition : metadata.getNamedQueryDefinitions() ) { namedQueries.put( namedQueryDefinition.getName(), namedQueryDefinition ); } namedSqlQueries = new HashMap(); for ( NamedSQLQueryDefinition namedNativeQueryDefinition: metadata.getNamedNativeQueryDefinitions() ) { namedSqlQueries.put( namedNativeQueryDefinition.getName(), namedNativeQueryDefinition ); } sqlResultSetMappings = Collections.unmodifiableMap( new HashMap( metadata.getResultSetMappingDefinitions() ) ); imports = new HashMap(metadata.getImports()); ======= namedQueryRepository = new NamedQueryRepository( metadata.getNamedQueryDefinitions(), metadata.getNamedNativeQueryDefinitions(), metadata.getResultSetMappingDefinitions() ); imports = new HashMap(); for ( Map.Entry importEntry : metadata.getImports() ) { imports.put( importEntry.getKey(), importEntry.getValue() ); } >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 // after all persisters and named queries are registered Iterator iter = entityPersisters.values().iterator();

Conflicting content

		//Named Queries:
<<<<<<< HEAD
		namedQueries = new HashMap();
		for ( NamedQueryDefinition namedQueryDefinition :  metadata.getNamedQueryDefinitions() ) {
			namedQueries.put( namedQueryDefinition.getName(), namedQueryDefinition );
		}
		namedSqlQueries = new HashMap();
		for ( NamedSQLQueryDefinition namedNativeQueryDefinition: metadata.getNamedNativeQueryDefinitions() ) {
			namedSqlQueries.put( namedNativeQueryDefinition.getName(), namedNativeQueryDefinition );
		}
		sqlResultSetMappings = Collections.unmodifiableMap( new HashMap( metadata.getResultSetMappingDefinitions() ) );
		imports = new HashMap(metadata.getImports());
=======
		namedQueryRepository = new NamedQueryRepository(
				metadata.getNamedQueryDefinitions(),
				metadata.getNamedNativeQueryDefinitions(),
				metadata.getResultSetMappingDefinitions()
		);

		imports = new HashMap();
		for ( Map.Entry importEntry : metadata.getImports() ) {
			imports.put( importEntry.getKey(), importEntry.getValue() );
		}
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8

		// after *all* persisters and named queries are registered
		Iterator iter = entityPersisters.values().iterator();

Solution content
//Named Queries: namedQueryRepository = new NamedQueryRepository( metadata.getNamedQueryDefinitions(), metadata.getNamedNativeQueryDefinitions(), metadata.getResultSetMappingDefinitions().values() ); imports = new HashMap(); for ( Map.Entry importEntry : metadata.getImports().entrySet() ) { imports.put( importEntry.getKey(), importEntry.getValue() ); } // after all persisters and named queries are registered Iterator iter = entityPersisters.values().iterator();

Solution content

		//Named Queries:
		namedQueryRepository = new NamedQueryRepository(
				metadata.getNamedQueryDefinitions(),
				metadata.getNamedNativeQueryDefinitions(),
				metadata.getResultSetMappingDefinitions().values()
		);

		imports = new HashMap();
		for ( Map.Entry importEntry : metadata.getImports().entrySet() ) {
			imports.put( importEntry.getKey(), importEntry.getValue() );
		}

		// after *all* persisters and named queries are registered
		Iterator iter = entityPersisters.values().iterator();

File
SessionFactoryImpl.java

Developer's decision
Manual

Kind of conflict
Attribute
For statement
Method invocation

Chunk

Conflicting content
} @Override <<<<<<< HEAD ======= public NamedQueryRepository getNamedQueryRepository() { return namedQueryRepository; } >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 public void registerNamedQueryDefinition(String name, NamedQueryDefinition definition) { namedQueryRepository.registerNamedQueryDefinition( name, definition ); }

Conflicting content

	}

	@Override
<<<<<<< HEAD
=======
	public NamedQueryRepository getNamedQueryRepository() {
		return namedQueryRepository;
	}

>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
	public void registerNamedQueryDefinition(String name, NamedQueryDefinition definition) {
		namedQueryRepository.registerNamedQueryDefinition( name, definition );
	}

Solution content
} @Override public NamedQueryRepository getNamedQueryRepository() { return namedQueryRepository; } public void registerNamedQueryDefinition(String name, NamedQueryDefinition definition) { namedQueryRepository.registerNamedQueryDefinition( name, definition ); }

Solution content

	}

	@Override
	public NamedQueryRepository getNamedQueryRepository() {
		return namedQueryRepository;
	}

	public void registerNamedQueryDefinition(String name, NamedQueryDefinition definition) {
		namedQueryRepository.registerNamedQueryDefinition( name, definition );
	}

File
SessionFactoryImpl.java

Developer's decision
Version 2

Kind of conflict
Method declaration

Chunk

Conflicting content
return namedQueryRepository.getNamedSQLQueryDefinition( queryName ); } <<<<<<< HEAD @Override public ResultSetMappingDefinition getResultSetMapping(String resultSetName) { return sqlResultSetMappings.get( resultSetName ); ======= public ResultSetMappingDefinition getResultSetMapping(String mappingName) { return namedQueryRepository.getResultSetMappingDefinition( mappingName ); >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 } @Override

Conflicting content

		return namedQueryRepository.getNamedSQLQueryDefinition( queryName );
	}

<<<<<<< HEAD
	@Override
	public ResultSetMappingDefinition getResultSetMapping(String resultSetName) {
		return sqlResultSetMappings.get( resultSetName );
=======
	public ResultSetMappingDefinition getResultSetMapping(String mappingName) {
		return namedQueryRepository.getResultSetMappingDefinition( mappingName );
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
	}

	@Override

Solution content
return namedQueryRepository.getNamedSQLQueryDefinition( queryName ); } public ResultSetMappingDefinition getResultSetMapping(String mappingName) { return namedQueryRepository.getResultSetMappingDefinition( mappingName ); } @Override

Solution content

		return namedQueryRepository.getNamedSQLQueryDefinition( queryName );
	}

	public ResultSetMappingDefinition getResultSetMapping(String mappingName) {
		return namedQueryRepository.getResultSetMappingDefinition( mappingName );
	}

	@Override

File
SessionFactoryImpl.java

Developer's decision
Version 2

Kind of conflict
Annotation
Method invocation
Method signature
Return statement

Chunk

Conflicting content
public static boolean isNotEmpty(Map map) { return !isEmpty( map ); } <<<<<<< HEAD public static boolean isEmpty(Object[] objs){ return objs == null \|\| objs.length ==0; } public static boolean isNotEmpty(Object[] objs){ return !isEmpty( objs ); } public static List createEmptyList(Class elementClass) { return Collections.emptyList(); } public static boolean isCollectionOrArray(Class clazz) { if ( clazz == null ) { return false; } if ( Collection.class.isAssignableFrom( clazz ) ) { return true; } if ( Map.class.isAssignableFrom( clazz ) ) { return true; } // if ( clazz.isArray() ) { // return true; // } return false; ======= public static Map makeCopy(Map map) { final Map copy = mapOfSize( map.size() + 1 ); copy.putAll( map ); return copy; >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 } }

Conflicting content

    public static boolean isNotEmpty(Map map) {
        return !isEmpty( map );
    }
<<<<<<< HEAD
	public static boolean isEmpty(Object[] objs){
		return objs == null || objs.length ==0;
	}
	public static boolean isNotEmpty(Object[] objs){
		return !isEmpty( objs );
	}

	public static  List createEmptyList(Class elementClass) {
		return Collections.emptyList();
	}

	public static boolean isCollectionOrArray(Class clazz) {
		if ( clazz == null ) {
			return false;
		}
		if ( Collection.class.isAssignableFrom( clazz ) ) {
			return true;
		}
		if ( Map.class.isAssignableFrom( clazz ) ) {
			return true;
		}
//		if ( clazz.isArray() ) {
//			return true;
//		}
		return false;
=======

	public static  Map makeCopy(Map map) {
		final Map copy = mapOfSize( map.size() + 1 );
		copy.putAll( map );
		return copy;
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
	}
}

Solution content
public static boolean isNotEmpty(Map map) { return !isEmpty( map ); } public static boolean isEmpty(Object[] objs){ return objs == null \|\| objs.length ==0; } public static boolean isNotEmpty(Object[] objs){ return !isEmpty( objs ); } public static List createEmptyList(Class elementClass) { return Collections.emptyList(); } public static boolean isCollectionOrArray(Class clazz) { if ( clazz == null ) { return false; } if ( Collection.class.isAssignableFrom( clazz ) ) { return true; } if ( Map.class.isAssignableFrom( clazz ) ) { return true; } // if ( clazz.isArray() ) { // return true; // } return false; } public static Map makeCopy(Map map) { final Map copy = mapOfSize( map.size() + 1 ); copy.putAll( map ); return copy; } }

Solution content

    public static boolean isNotEmpty(Map map) {
        return !isEmpty( map );
    }
	public static boolean isEmpty(Object[] objs){
		return objs == null || objs.length ==0;
	}
	public static boolean isNotEmpty(Object[] objs){
		return !isEmpty( objs );
	}

	public static  List createEmptyList(Class elementClass) {
		return Collections.emptyList();
	}

	public static boolean isCollectionOrArray(Class clazz) {
		if ( clazz == null ) {
			return false;
		}
		if ( Collection.class.isAssignableFrom( clazz ) ) {
			return true;
		}
		if ( Map.class.isAssignableFrom( clazz ) ) {
			return true;
		}
//		if ( clazz.isArray() ) {
//			return true;
//		}
		return false;
	}
	public static  Map makeCopy(Map map) {
		final Map copy = mapOfSize( map.size() + 1 );
		copy.putAll( map );
		return copy;
	}
}

File
CollectionHelper.java

Developer's decision
Concatenation

Kind of conflict
Comment
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable

Chunk

Conflicting content
<<<<<<< HEAD */ package org.hibernate.type; import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; ======= import org.dom4j.Element; import org.dom4j.Node; >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.Filter;

Conflicting content

<<<<<<< HEAD
 */
package org.hibernate.type;
import java.io.Serializable;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;

=======
import org.dom4j.Element;
import org.dom4j.Node;
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
import org.hibernate.AssertionFailure;
import org.hibernate.EntityMode;
import org.hibernate.Filter;

Solution content
*/ package org.hibernate.type; import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.Filter;

Solution content

 */
package org.hibernate.type;

import java.io.Serializable;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;

import org.hibernate.AssertionFailure;
import org.hibernate.EntityMode;
import org.hibernate.Filter;

File
EntityType.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames; import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper; import org.hibernate.proxy.EntityNotFoundDelegate; <<<<<<< HEAD import org.hibernate.secure.internal.JACCConfiguration; ======= import org.hibernate.secure.spi.GrantedPermission; import org.hibernate.secure.spi.JaccService; import org.hibernate.service.ConfigLoader; >>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8 import org.hibernate.service.ServiceRegistry; import org.hibernate.service.spi.ServiceRegistryImplementor;

Conflicting content

import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
import org.hibernate.proxy.EntityNotFoundDelegate;
<<<<<<< HEAD
import org.hibernate.secure.internal.JACCConfiguration;
=======
import org.hibernate.secure.spi.GrantedPermission;
import org.hibernate.secure.spi.JaccService;
import org.hibernate.service.ConfigLoader;
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.spi.ServiceRegistryImplementor;

Solution content

import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
import org.hibernate.proxy.EntityNotFoundDelegate;
import org.hibernate.secure.spi.GrantedPermission;
import org.hibernate.secure.spi.JaccService;
import org.hibernate.service.ServiceRegistry;
import org.hibernate.service.spi.ServiceRegistryImplementor;

File
EntityManagerFactoryBuilderImpl.java

Developer's decision
Combination

Kind of conflict
Import

Chunk

Conflicting content

			}
		}

<<<<<<< HEAD
		if ( jaccDefinitions != null ) {
			for ( JaccDefinition jaccDefinition : jaccDefinitions ) {
				JACCConfiguration jaccCfg = new JACCConfiguration( jaccDefinition.contextId );
				jaccCfg.addPermission(
						jaccDefinition.role,
						jaccDefinition.clazz,
						jaccDefinition.actions
				);
=======
		if ( grantedJaccPermissions != null ) {
			final JaccService jaccService = serviceRegistry.getService( JaccService.class );
			for ( GrantedPermission grantedPermission : grantedJaccPermissions ) {
				jaccService.addPermission( grantedPermission );
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
			}
		}

Solution content

			}
		}
		if ( grantedJaccPermissions != null ) {
			final JaccService jaccService = serviceRegistry.getService( JaccService.class );
			for ( GrantedPermission grantedPermission : grantedJaccPermissions ) {
				jaccService.addPermission( grantedPermission );
			}
		}

File
EntityManagerFactoryBuilderImpl.java

Developer's decision
Version 2

Kind of conflict
For statement
If statement
Method invocation
Variable

Chunk

Conflicting content

import org.hibernate.jpa.event.spi.jpa.ListenerFactory;
import org.hibernate.jpa.event.internal.jpa.StandardListenerFactory;
import org.hibernate.mapping.PersistentClass;
<<<<<<< HEAD
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.secure.internal.JACCPreDeleteEventListener;
import org.hibernate.secure.internal.JACCPreInsertEventListener;
import org.hibernate.secure.internal.JACCPreLoadEventListener;
import org.hibernate.secure.internal.JACCPreUpdateEventListener;
import org.hibernate.secure.internal.JACCSecurityListener;
=======
import org.hibernate.metamodel.binding.EntityBinding;
import org.hibernate.metamodel.source.MetadataImplementor;
>>>>>>> bc85168015927f8fc086c812e0e29ab0f328f8c8
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;

Solution content

import org.hibernate.jpa.event.spi.jpa.ListenerFactory;
import org.hibernate.jpa.event.internal.jpa.StandardListenerFactory;
import org.hibernate.mapping.PersistentClass;
<<<<<<< HEAD
import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.MetadataImplementor;
import org.hibernate.secure.internal.JACCPreDeleteEventListener;
import org.hibernate.secure.internal.JACCPreInsertEventListener;
import org.hibernate.secure.internal.JACCPreLoadEventListener;
import org.hibernate.secure.internal.JACCPreUpdateEventListener;
import org.hibernate.secure.internal.JACCSecurityListener;
=======
import org.hibernate.metamodel.binding.EntityBinding;
import org.hibernate.metamodel.source.MetadataImplementor;
>>>>>>> master
import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
import org.hibernate.service.spi.ServiceRegistryImplementor;
import org.hibernate.service.spi.SessionFactoryServiceRegistry;

File
JpaIntegrator.java

Developer's decision
Manual

Kind of conflict
Import

Projects >> hibernate-orm >>cb59c84389bcca877c667b2981f091ef79a3621b