Projects >> zanata-server >>6890c0d44b770efb9e89d154b35c4e2926a62686

Chunk
Conflicting content 
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.FieldBridge;
<<<<<<< HEAD
import org.hibernate.search.annotations.FilterCacheModeType;
import org.hibernate.search.annotations.FullTextFilterDef;
=======
import org.hibernate.search.annotations.Index;
>>>>>>> 53a8be4cfc4516fb64404c2794328865e9d39734
import org.hibernate.search.annotations.Indexed;
import org.hibernate.validator.constraints.NotEmpty;
import org.zanata.common.HasContents;
Solution content 
import org.hibernate.search.annotations.Analyze;
import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.FieldBridge;
import org.hibernate.search.annotations.FilterCacheModeType;
import org.hibernate.search.annotations.FullTextFilterDef;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.validator.constraints.NotEmpty;
import org.zanata.common.HasContents;
File
HTextFlow.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
@Entity
@org.hibernate.annotations.Entity(mutable = false)
@NamedQueries({
<<<<<<< HEAD
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[1]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
               		  "and contents[0] = ?3"),
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[2]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4"),
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[3]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5"),
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[4]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6"),
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[5]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6 and contents[4] = ?7"),
   @NamedQuery(name = "HTextFlowTargetHistory.findContentInHistory[6]",
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6 and contents[4] = ?7 and contents[5] = ?8")
=======
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+1,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
               		  "and contents[0] = ?"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+2,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
                       "and contents[0] = ? and contents[1] = ?"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+3,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
                       "and contents[0] = ? and contents[1] = ? and contents[2] = ?"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+4,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
                       "and contents[0] = ? and contents[1] = ? and contents[2] = ? and contents[3] = ?"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+5,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
                       "and contents[0] = ? and contents[1] = ? and contents[2] = ? and contents[3] = ? and contents[4] = ?"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+6,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ? and size(t.contents) = ? " +
                       "and contents[0] = ? and contents[1] = ? and contents[2] = ? and contents[3] = ? and contents[4] = ? and contents[5] = ?")
>>>>>>> 53a8be4cfc4516fb64404c2794328865e9d39734
})
public class HTextFlowTargetHistory extends HTextContainer implements Serializable, ITextFlowTargetHistory
{
Solution content 
@Entity
@org.hibernate.annotations.Entity(mutable = false)
@NamedQueries({
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+1,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
               		  "and contents[0] = ?3"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+2,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+3,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+4,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+5,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6 and contents[4] = ?7"),
   @NamedQuery(name = HTextFlowTargetHistory.QUERY_MATCHING_HISTORY+6,
               query = "select count(*) from HTextFlowTargetHistory t where t.textFlowTarget = ?1 and size(t.contents) = ?2 " +
                       "and contents[0] = ?3 and contents[1] = ?4 and contents[2] = ?5 and contents[3] = ?6 and contents[4] = ?7 and contents[5] = ?8")
})
public class HTextFlowTargetHistory extends HTextContainer implements Serializable, ITextFlowTargetHistory
{
File
HTextFlowTargetHistory.java
Developer's decision
Combination
Kind of conflict
Annotation
Chunk
Conflicting content 
         if (opts.isReindex())
         {
<<<<<<< HEAD
            totalOperations += (Long) session.createCriteria(clazz).setProjection(Projections.rowCount()).list().get(0);
=======
            totalOperations += getIndexer(clazz).getEntityCount(session, clazz);
>>>>>>> 53a8be4cfc4516fb64404c2794328865e9d39734
         }

         if (opts.isOptimize())
Solution content 
         if (opts.isReindex())
         {
            totalOperations += getIndexer(clazz).getEntityCount(session, clazz);
         }

         if (opts.isOptimize())
File
ReindexAsyncBean.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Method invocation
Variable