Projects >> hibernate-orm >>cda5d8e959a61bbabab63128fb28c06be6ff7b8b

Chunk
Conflicting content 
import java.util.Map;
import java.util.Set;

<<<<<<< HEAD
import org.jboss.logging.Logger;

=======
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
import org.hibernate.Filter;
import org.hibernate.MappingException;
import org.hibernate.QueryException;
Solution content 
import java.util.Map;
import java.util.Set;

import org.jboss.logging.Logger;
import org.hibernate.Filter;
import org.hibernate.MappingException;
import org.hibernate.QueryException;
File
QueryPlanCache.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		return new ParameterMetadata( ordinalDescriptors, namedParamDescriptorMap );
	}

<<<<<<< HEAD
	public HQLQueryPlan getHQLQueryPlan( String queryString, boolean shallow, Map enabledFilters)
=======
	/**
	 * Get the query plan for the given HQL query, creating it and caching it if not already cached
	 *
	 * @param queryString The HQL query string
	 * @param shallow Whether the execution will be shallow
	 * @param enabledFilters The filters enabled on the Session
	 *
	 * @return The query plan
	 *
	 * @throws QueryException Indicates a problem translating the query
	 * @throws MappingException Indicates a problem translating the query
	 */
	@SuppressWarnings("unchecked")
	public HQLQueryPlan getHQLQueryPlan(String queryString, boolean shallow, Map enabledFilters)
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
			throws QueryException, MappingException {
		final HQLQueryPlanKey key = new HQLQueryPlanKey( queryString, shallow, enabledFilters );
		HQLQueryPlan value = (HQLQueryPlan) queryPlanCache.get( key );
Solution content 
		return new ParameterMetadata( ordinalDescriptors, namedParamDescriptorMap );
	}

	/**
	 * Get the query plan for the given HQL query, creating it and caching it if not already cached
	 *
	 * @param queryString The HQL query string
	 * @param shallow Whether the execution will be shallow
	 * @param enabledFilters The filters enabled on the Session
	 *
	 * @return The query plan
	 *
	 * @throws QueryException Indicates a problem translating the query
	 * @throws MappingException Indicates a problem translating the query
	 */
	@SuppressWarnings("unchecked")
	public HQLQueryPlan getHQLQueryPlan(String queryString, boolean shallow, Map enabledFilters)
			throws QueryException, MappingException {
		final HQLQueryPlanKey key = new HQLQueryPlanKey( queryString, shallow, enabledFilters );
		HQLQueryPlan value = (HQLQueryPlan) queryPlanCache.get( key );
File
QueryPlanCache.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method signature
Chunk
Conflicting content 
/*
 * Hibernate, Relational Persistence for Idiomatic Java
 *
<<<<<<< HEAD
 * Copyright (c) 2008, 2012, Red Hat Inc. or third-party contributors as
=======
 * Copyright (c) 2008, 2013, Red Hat Inc. or third-party contributors as
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
 * indicated by the @author tags or express copyright attribution
 * statements applied by the authors.  All third-party contributions are
 * distributed under license by Red Hat Inc.
Solution content 
/*
 * Hibernate, Relational Persistence for Idiomatic Java
 *
<<<<<<< HEAD
 * Copyright (c) 2008, 2012, Red Hat Inc. or third-party contributors as
=======
 * Copyright (c) 2008, 2013, Red Hat Inc. or third-party contributors as
>>>>>>> master
 * indicated by the @author tags or express copyright attribution
 * statements applied by the authors.  All third-party contributions are
 * distributed under license by Red Hat Inc.
File
SequenceStructure.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
 * @author Steve Ebersole
 */
public class SequenceStructure implements DatabaseStructure {
<<<<<<< HEAD
    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, SequenceStructure.class.getName());
=======
	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
			CoreMessageLogger.class,
			SequenceStructure.class.getName()
	);
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0

	private ObjectName qualifiedSequenceName;
	private final String sequenceName;
Solution content 
 * @author Steve Ebersole
 */
public class SequenceStructure implements DatabaseStructure {
	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
			CoreMessageLogger.class,
			SequenceStructure.class.getName()
	);

	private ObjectName qualifiedSequenceName;
	private final String sequenceName;
File
SequenceStructure.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
	 * @param dialect The dialect in effect
	 * @return The sequence name
	 */
<<<<<<< HEAD
	protected ObjectName determineSequenceName(Properties params, Dialect dialect) {
		String sequencePerEntitySuffix = ConfigurationHelper.getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, params, DEF_SEQUENCE_SUFFIX );
=======
	protected String determineSequenceName(Properties params, Dialect dialect) {
		final String sequencePerEntitySuffix = ConfigurationHelper.getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, params, DEF_SEQUENCE_SUFFIX );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
		// JPA_ENTITY_NAME value honors  (HBM) and @Entity#name (JPA) overrides.
		String sequenceName = ConfigurationHelper.getBoolean( CONFIG_PREFER_SEQUENCE_PER_ENTITY, params, false )
				? params.getProperty( JPA_ENTITY_NAME ) + sequencePerEntitySuffix
Solution content 
	 * @param dialect The dialect in effect
	 * @return The sequence name
	 */
	protected ObjectName determineSequenceName(Properties params, Dialect dialect) {
		String sequencePerEntitySuffix = ConfigurationHelper.getString( CONFIG_SEQUENCE_PER_ENTITY_SUFFIX, params, DEF_SEQUENCE_SUFFIX );
		// JPA_ENTITY_NAME value honors  (HBM) and @Entity#name (JPA) overrides.
		String sequenceName = ConfigurationHelper.getBoolean( CONFIG_PREFER_SEQUENCE_PER_ENTITY, params, false )
				? params.getProperty( JPA_ENTITY_NAME ) + sequencePerEntitySuffix
File
SequenceStyleGenerator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		String sequenceName = ConfigurationHelper.getBoolean( CONFIG_PREFER_SEQUENCE_PER_ENTITY, params, false )
				? params.getProperty( JPA_ENTITY_NAME ) + sequencePerEntitySuffix
				: DEF_SEQUENCE_NAME;
<<<<<<< HEAD
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		sequenceName = normalizer.normalizeIdentifierQuoting(
				ConfigurationHelper.getString( SEQUENCE_PARAM, params, sequenceName )
		);
		if ( sequenceName.indexOf( '.' ) < 0 ) {
			String schemaName = normalizer.normalizeIdentifierQuoting( params.getProperty( SCHEMA ) );
			String catalogName = normalizer.normalizeIdentifierQuoting( params.getProperty( CATALOG ) );

			return new ObjectName( catalogName, schemaName, sequenceName );
		}
		else {
			return ObjectName.parse( sequenceName );
		}
=======
		final ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
		sequenceName = ConfigurationHelper.getString( SEQUENCE_PARAM, params, sequenceName );
		if ( sequenceName.indexOf( '.' ) < 0 ) {
			sequenceName = normalizer.normalizeIdentifierQuoting( sequenceName );
			final String schemaName = params.getProperty( SCHEMA );
			final String catalogName = params.getProperty( CATALOG );
			sequenceName = Table.qualify(
					dialect.quote( catalogName ),
					dialect.quote( schemaName ),
					dialect.quote( sequenceName )
			);
		}
		// if already qualified there is not much we can do in a portable manner so we pass it
		// through and assume the user has set up the name correctly.

		return sequenceName;
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	}

	/**
Solution content 
		String sequenceName = ConfigurationHelper.getBoolean( CONFIG_PREFER_SEQUENCE_PER_ENTITY, params, false )
				? params.getProperty( JPA_ENTITY_NAME ) + sequencePerEntitySuffix
				: DEF_SEQUENCE_NAME;
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		sequenceName = normalizer.normalizeIdentifierQuoting(
				ConfigurationHelper.getString( SEQUENCE_PARAM, params, sequenceName )
		);
		if ( sequenceName.indexOf( '.' ) < 0 ) {
			String schemaName = normalizer.normalizeIdentifierQuoting( params.getProperty( SCHEMA ) );
			String catalogName = normalizer.normalizeIdentifierQuoting( params.getProperty( CATALOG ) );

			return new ObjectName( catalogName, schemaName, sequenceName );
		}
		else {
			return ObjectName.parse( sequenceName );
		}
	}

	/**
File
SequenceStyleGenerator.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
	 * @param dialect The dialect in effect.
	 * @return The value column name
	 */
<<<<<<< HEAD
	protected Identifier determineValueColumnName(Properties params, Dialect dialect) {
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		return Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
=======
	protected String determineValueColumnName(Properties params, Dialect dialect) {
		final ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
		final String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		return dialect.quote( normalizer.normalizeIdentifierQuoting( name ) );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	}

	/**
Solution content 
	 * @param dialect The dialect in effect.
	 * @return The value column name
	 */
	protected Identifier determineValueColumnName(Properties params, Dialect dialect) {
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		return Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
	}

	/**
File
SequenceStyleGenerator.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
			return new SequenceStructure( dialect, sequenceName, initialValue, incrementSize, type.getReturnedClass() );
		}
		else {
<<<<<<< HEAD
			Identifier valueColumnName = determineValueColumnName( params, dialect );
=======
			final String valueColumnName = determineValueColumnName( params, dialect );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
			return new TableStructure( dialect, sequenceName, valueColumnName, initialValue, incrementSize, type.getReturnedClass() );
		}
	}
Solution content 
			return new SequenceStructure( dialect, sequenceName, initialValue, incrementSize, type.getReturnedClass() );
		}
		else {
			Identifier valueColumnName = determineValueColumnName( params, dialect );
			return new TableStructure( dialect, sequenceName, valueColumnName, initialValue, incrementSize, type.getReturnedClass() );
		}
	}
File
SequenceStyleGenerator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	 * @return The table name to use.
	 */
	protected String determineGeneratorTableName(Properties params, Dialect dialect) {
<<<<<<< HEAD
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = normalizer.normalizeIdentifierQuoting(
				ConfigurationHelper.getString( TABLE_PARAM, params, DEF_TABLE )
		);
		boolean isGivenNameUnqualified = name.indexOf( '.' ) < 0;
		if ( isGivenNameUnqualified ) {
			// if the given name is un-qualified we may need to qualify it
			String schemaName = normalizer.normalizeIdentifierQuoting( params.getProperty( SCHEMA ) );
			String catalogName = normalizer.normalizeIdentifierQuoting( params.getProperty( CATALOG ) );

			qualifiedTableName = new ObjectName( catalogName, schemaName, name );

			name = qualifiedTableName.toText( dialect );
		}
		else {
			qualifiedTableName = ObjectName.parse( name );
		}
=======
		String name = ConfigurationHelper.getString( TABLE_PARAM, params, DEF_TABLE );
		final boolean isGivenNameUnqualified = name.indexOf( '.' ) < 0;
		if ( isGivenNameUnqualified ) {
			final ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
			name = normalizer.normalizeIdentifierQuoting( name );
			// if the given name is un-qualified we may neen to qualify it
			final String schemaName = normalizer.normalizeIdentifierQuoting( params.getProperty( SCHEMA ) );
			final String catalogName = normalizer.normalizeIdentifierQuoting( params.getProperty( CATALOG ) );
			name = Table.qualify(
					dialect.quote( catalogName ),
					dialect.quote( schemaName ),
					dialect.quote( name)
			);
		}
		// if already qualified there is not much we can do in a portable manner so we pass it
		// through and assume the user has set up the name correctly.
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0

		return name;
	}
Solution content 
	 * @return The table name to use.
	 */
	protected String determineGeneratorTableName(Properties params, Dialect dialect) {
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = normalizer.normalizeIdentifierQuoting(
				ConfigurationHelper.getString( TABLE_PARAM, params, DEF_TABLE )
		);
		boolean isGivenNameUnqualified = name.indexOf( '.' ) < 0;
		if ( isGivenNameUnqualified ) {
			// if the given name is un-qualified we may need to qualify it
			String schemaName = normalizer.normalizeIdentifierQuoting( params.getProperty( SCHEMA ) );
			String catalogName = normalizer.normalizeIdentifierQuoting( params.getProperty( CATALOG ) );

			qualifiedTableName = new ObjectName( catalogName, schemaName, name );

			name = qualifiedTableName.toText( dialect );
		}
		else {
			qualifiedTableName = ObjectName.parse( name );
		}
		return name;
	}
File
TableGenerator.java
Developer's decision
Combination
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
	 * @return The name of the segment column
	 */
	protected String determineSegmentColumnName(Properties params, Dialect dialect) {
<<<<<<< HEAD
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( SEGMENT_COLUMN_PARAM, params, DEF_SEGMENT_COLUMN );
		qualifiedSegmentColumnName = Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
		return qualifiedSegmentColumnName.getText( dialect );
=======
		final ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
		final String name = ConfigurationHelper.getString( SEGMENT_COLUMN_PARAM, params, DEF_SEGMENT_COLUMN );
		return dialect.quote( normalizer.normalizeIdentifierQuoting( name ) );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	}

	/**
Solution content 
	 * @return The name of the segment column
	 */
	protected String determineSegmentColumnName(Properties params, Dialect dialect) {
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( SEGMENT_COLUMN_PARAM, params, DEF_SEGMENT_COLUMN );
		qualifiedSegmentColumnName = Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
		return qualifiedSegmentColumnName.getText( dialect );
	}

	/**
File
TableGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Method invocation
Return statement
Variable
Chunk
Conflicting content 
	 * @return The name of the value column
	 */
	protected String determineValueColumnName(Properties params, Dialect dialect) {
<<<<<<< HEAD
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		qualifiedValueColumnName = Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
		return qualifiedValueColumnName.getText( dialect );
=======
		final ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
		final String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		return dialect.quote( normalizer.normalizeIdentifierQuoting( name ) );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	}

	/**
Solution content 
	 * @return The name of the value column
	 */
	protected String determineValueColumnName(Properties params, Dialect dialect) {
		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
		String name = ConfigurationHelper.getString( VALUE_COLUMN_PARAM, params, DEF_VALUE_COLUMN );
		qualifiedValueColumnName = Identifier.toIdentifier( normalizer.normalizeIdentifierQuoting( name ) );
		return qualifiedValueColumnName.getText( dialect );
	}

	/**
File
TableGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Cast expression
Method invocation
Return statement
Variable
Chunk
Conflicting content 
	 * @return The default segment value to use.
	 */
	protected String determineDefaultSegmentValue(Properties params) {
<<<<<<< HEAD
		boolean preferSegmentPerEntity = ConfigurationHelper.getBoolean(
				CONFIG_PREFER_SEGMENT_PER_ENTITY,
				params,
				false
		);
		String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE;
        LOG.usingDefaultIdGeneratorSegmentValue( qualifiedTableName.toString(), segmentColumnName, defaultToUse );
=======
		final boolean preferSegmentPerEntity = ConfigurationHelper.getBoolean( CONFIG_PREFER_SEGMENT_PER_ENTITY, params, false );
		final String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE;
		LOG.usingDefaultIdGeneratorSegmentValue( tableName, segmentColumnName, defaultToUse );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
		return defaultToUse;
	}
Solution content 
	 * @return The default segment value to use.
	 */
	protected String determineDefaultSegmentValue(Properties params) {
		boolean preferSegmentPerEntity = ConfigurationHelper.getBoolean(
				CONFIG_PREFER_SEGMENT_PER_ENTITY,
				params,
				false
		);
		String defaultToUse = preferSegmentPerEntity ? params.getProperty( TABLE ) : DEF_SEGMENT_VALUE;
        LOG.usingDefaultIdGeneratorSegmentValue( qualifiedTableName.toString(), segmentColumnName, defaultToUse );
		return defaultToUse;
	}
File
TableGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
	protected String buildSelectQuery(Dialect dialect) {
		final String alias = "tbl";
<<<<<<< HEAD
		String query = "select " + StringHelper.qualify( alias, valueColumnName ) +
				" from " + qualifiedTableName.toText( dialect ) + ' ' + alias +
=======
		final String query = "select " + StringHelper.qualify( alias, valueColumnName ) +
				" from " + tableName + ' ' + alias +
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
				" where " + StringHelper.qualify( alias, segmentColumnName ) + "=?";
		final LockOptions lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
		lockOptions.setAliasSpecificLockMode( alias, LockMode.PESSIMISTIC_WRITE );
Solution content 
	protected String buildSelectQuery(Dialect dialect) {
		final String alias = "tbl";
		final String query = "select " + StringHelper.qualify( alias, valueColumnName ) +
				" from " + qualifiedTableName.toText( dialect ) + ' ' + alias +
				" where " + StringHelper.qualify( alias, segmentColumnName ) + "=?";
		final LockOptions lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
		lockOptions.setAliasSpecificLockMode( alias, LockMode.PESSIMISTIC_WRITE );
File
TableGenerator.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
		namedQueryRepository = new NamedQueryRepository(
				metadata.getNamedQueryDefinitions(),
				metadata.getNamedNativeQueryDefinitions(),
<<<<<<< HEAD
				metadata.getResultSetMappingDefinitions().values(),
				null
=======
				metadata.getResultSetMappingDefinitions(),
				new HashMap(  )
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
		);

		imports = new HashMap();
Solution content 
		namedQueryRepository = new NamedQueryRepository(
				metadata.getNamedQueryDefinitions(),
				metadata.getNamedNativeQueryDefinitions(),
				metadata.getResultSetMappingDefinitions().values(),
				new HashMap(  )
		);

		imports = new HashMap();
File
SessionFactoryImpl.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
					sql
			);
		}
<<<<<<< HEAD
		return Integer.class.isInstance( loc ) ? new int[] {Integer.class.cast( loc )} : ArrayHelper.toIntArray( (List)loc );
=======
		if ( loc instanceof Integer ) {
			return new int[] { (Integer) loc };
		}
		else {
			return ArrayHelper.toIntArray( ( List ) loc );
		}
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	}
Solution content 
					sql
			);
		}
		if ( loc instanceof Integer ) {
			return new int[] { (Integer) loc };
		}
		else {
			return ArrayHelper.toIntArray( ( List ) loc );
		}
	}
File
CustomLoader.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Method invocation
Return statement
Chunk
Conflicting content 
		return propertyNullability;
	}

<<<<<<< HEAD
=======
	@Override
    public boolean isXMLElement() {
		return true;
	}
	@Override
	public Object fromXMLNode(Node xml, Mapping factory) throws HibernateException {
		return xml;
	}
	@Override
	public void setToXMLNode(Node node, Object value, SessionFactoryImplementor factory) throws HibernateException {
		replaceNode( node, ( Element ) value );
	}
	@Override
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
	public boolean[] toColumnNullness(Object value, Mapping mapping) {
		boolean[] result = new boolean[ getColumnSpan( mapping ) ];
		if ( value == null ) {
Solution content 
		return propertyNullability;
	}

	public boolean[] toColumnNullness(Object value, Mapping mapping) {
		boolean[] result = new boolean[ getColumnSpan( mapping ) ];
		if ( value == null ) {
File
ComponentType.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import org.junit.Test;

import org.hibernate.Filter;
<<<<<<< HEAD
=======
import org.hibernate.Session;
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
Solution content 
import org.junit.Test;

import org.hibernate.Filter;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
File
TupleSupportTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	public void testImplicitTupleNotEquals() {
		final String hql = "from TheEntity e where e.compositeValue <> :p1";
		HQLQueryPlan queryPlan = ( (SessionFactoryImplementor) sessionFactory ).getQueryPlanCache()
<<<<<<< HEAD
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );
=======
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0

		assertEquals( 1, queryPlan.getSqlStrings().length );
		System.out.println( " SQL : " + queryPlan.getSqlStrings()[0] );
Solution content 
	public void testImplicitTupleNotEquals() {
		final String hql = "from TheEntity e where e.compositeValue <> :p1";
		HQLQueryPlan queryPlan = ( (SessionFactoryImplementor) sessionFactory ).getQueryPlanCache()
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );

		assertEquals( 1, queryPlan.getSqlStrings().length );
		System.out.println( " SQL : " + queryPlan.getSqlStrings()[0] );
File
TupleSupportTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
	public void testImplicitTupleNotInList() {
		final String hql = "from TheEntity e where e.compositeValue not in (:p1,:p2)";
		HQLQueryPlan queryPlan = ( (SessionFactoryImplementor) sessionFactory ).getQueryPlanCache()
<<<<<<< HEAD
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );
=======
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );
>>>>>>> 899b306f2612311a88a7f1bf4175ea58d82e42e0

		assertEquals( 1, queryPlan.getSqlStrings().length );
		System.out.println( " SQL : " + queryPlan.getSqlStrings()[0] );
Solution content 
	public void testImplicitTupleNotInList() {
		final String hql = "from TheEntity e where e.compositeValue not in (:p1,:p2)";
		HQLQueryPlan queryPlan = ( (SessionFactoryImplementor) sessionFactory ).getQueryPlanCache()
				.getHQLQueryPlan( hql, false, Collections.emptyMap() );

		assertEquals( 1, queryPlan.getSqlStrings().length );
		System.out.println( " SQL : " + queryPlan.getSqlStrings()[0] );
File
TupleSupportTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable