Projects >> slipp >>dfbbb925e77ea5cc4aeac3d2ed636786abccdb85

Chunk
Conflicting content 
	}

	@Cacheable(value="fbgroups", key="#loginUser.id")
<<<<<<< HEAD
	public List findFacebookGroups(SocialUser loginUser) {
		FacebookClient facebookClient = new DefaultFacebookClient(loginUser.getAccessToken());
		String query = "SELECT gid, name FROM group WHERE gid IN "
				+ "(SELECT gid FROM group_member WHERE uid = me() AND bookmark_order <= 15 order by bookmark_order ASC)";
		List groups = facebookClient.executeFqlQuery(query, FacebookGroup.class);
		log.debug("groups size : {}", groups.size());
		return groups;
=======
	public List findFacebookGroups(SocialUser loginUser) {
		int groupLimit = 10;
		FacebookClient facebookClient = createFacebookClient(loginUser);
		Connection myGroups = facebookClient.fetchConnection("/me/groups", Group.class,
				Parameter.with("limit", groupLimit));
		List allGroups = Lists.newArrayList();
		for (List groups : myGroups) {
			allGroups.addAll(groups);
		}
		
		if (allGroups.size() < groupLimit) {
			groupLimit = allGroups.size();
		}
		
		return allGroups.subList(0, groupLimit);
>>>>>>> 1aa6a9b4d5b43a325de65c2a19d8ee65f2a06f6d
	}

	private Post findPost(FacebookClient facebookClient, String postId) {
Solution content 
	}

	@Cacheable(value="fbgroups", key="#loginUser.id")
	public List findFacebookGroups(SocialUser loginUser) {
		int groupLimit = 10;
		FacebookClient facebookClient = createFacebookClient(loginUser);
		Connection myGroups = facebookClient.fetchConnection("/me/groups", Group.class,
				Parameter.with("limit", groupLimit));
		List allGroups = Lists.newArrayList();
		for (List groups : myGroups) {
			allGroups.addAll(groups);
		}
		
		if (allGroups.size() < groupLimit) {
			groupLimit = allGroups.size();
		}
		
		return allGroups.subList(0, groupLimit);
	}

	private Post findPost(FacebookClient facebookClient, String postId) {
File
FacebookService.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
package net.slipp.service.qna;

<<<<<<< HEAD
import java.util.List;
import java.util.Set;
=======
import java.util.Collection;
import java.util.List;
>>>>>>> 1aa6a9b4d5b43a325de65c2a19d8ee65f2a06f6d

import javax.annotation.Resource;
Solution content 
package net.slipp.service.qna;

import java.util.Collection;
import java.util.List;
import java.util.Set;

import javax.annotation.Resource;
File
MigrationService.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import javax.annotation.Resource;

import net.slipp.domain.qna.Question;
<<<<<<< HEAD
import net.slipp.domain.tag.Tag;
=======
import net.slipp.domain.qna.SnsConnection;
>>>>>>> 1aa6a9b4d5b43a325de65c2a19d8ee65f2a06f6d
import net.slipp.repository.qna.QuestionRepository;
import net.slipp.service.tag.TagHelper;
import net.slipp.web.tag.AdminTagController;
Solution content 
import javax.annotation.Resource;

import net.slipp.domain.qna.Question;
import net.slipp.domain.qna.SnsConnection;
import net.slipp.domain.tag.Tag;
import net.slipp.repository.qna.QuestionRepository;
import net.slipp.service.tag.TagHelper;
import net.slipp.web.tag.AdminTagController;
File
MigrationService.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	@Resource(name = "questionRepository")
	private QuestionRepository questionRepository;
	
<<<<<<< HEAD
	public void migration() {
		List questions = questionRepository.findAll();
		for (Question question : questions) {
			Set tags = question.getTags();
			String denormalizedTags = TagHelper.denormalizedTags(tags);
			questionRepository.updateDenormalizedTags(question.getQuestionId(), denormalizedTags);
			log.debug("migration : questionId : {}, denormalizedTags {}", question.getQuestionId(), denormalizedTags);
=======
	public void removeIdSnsConnection() {
		List questions = questionRepository.findAll();
		for (Question question : questions) {
			Collection connections = question.getSnsConnection();
			for (SnsConnection snsConnection : connections) {
				snsConnection.removeId();
			}
>>>>>>> 1aa6a9b4d5b43a325de65c2a19d8ee65f2a06f6d
		}
	}
}
Solution content 
	@Resource(name = "questionRepository")
	private QuestionRepository questionRepository;
	
	public void migration() {
		List questions = questionRepository.findAll();
		for (Question question : questions) {
			Set tags = question.getTags();
			String denormalizedTags = TagHelper.denormalizedTags(tags);
			questionRepository.updateDenormalizedTags(question.getQuestionId(), denormalizedTags);
			log.debug("migration : questionId : {}, denormalizedTags {}", question.getQuestionId(), denormalizedTags);
		}
	}
	
	public void removeIdSnsConnection() {
		List questions = questionRepository.findAll();
		for (Question question : questions) {
			Collection connections = question.getSnsConnection();
			for (SnsConnection snsConnection : connections) {
				snsConnection.removeId();
			}
		}
	}
}
File
MigrationService.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		return "redirect:/";
	}
	
<<<<<<< HEAD
	@RequestMapping("/tags")
	public String tags() throws Exception {
		migrationService.migration();
		return "redirect:/admin/tags";
=======
	@RequestMapping("/removeSnsConnections")
	public String removeSnsConnections() {
		migrationService.removeIdSnsConnection();
		return "redirect:/";
>>>>>>> 1aa6a9b4d5b43a325de65c2a19d8ee65f2a06f6d
	}
}
Solution content 
		return "redirect:/";
	}

	@RequestMapping("/tags")
	public String tags() throws Exception {
		migrationService.migration();
		return "redirect:/admin/tags";
	}

	@RequestMapping("/removeSnsConnections")
	public String removeSnsConnections() {
		migrationService.removeIdSnsConnection();
		return "redirect:/";
	}
}
File
MigrationsController.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method invocation
Method signature
Return statement