Projects >> Synapse-Repository-Services >>64dfdad91cf507b4dee3522445b687b48ff16cd4

Chunk
Conflicting content 
	
	UserEvaluationPermissions getUserEvaluationPermissions(String evalId)
			throws SynapseException;
	
<<<<<<< HEAD
	/**
	 * Create a new ColumnModel. If a column already exists with the same parameters,
	 * that column will be returned.
	 * @param model
	 * @return
	 * @throws SynapseException 
	 */
	ColumnModel createColumnModel(ColumnModel model) throws SynapseException;
	
	/**
	 * Get a ColumnModel from its ID.
	 * 
	 * @param columnId
	 * @return
	 * @throws SynapseException
	 */
	ColumnModel getColumnModel(String columnId) throws SynapseException;
=======
	// Team services
	Team createTeam(Team team) throws SynapseException;
	Team getTeam(String id) throws SynapseException;
	PaginatedResults getTeams(String fragment, long limit, long offset) throws SynapseException;
	PaginatedResults getTeamsForUser(String memberId, long limit, long offset) throws SynapseException;
	URL getTeamIcon(String teamId, Boolean redirect) throws SynapseException;
	Team updateTeam(Team team) throws SynapseException;
	void deleteTeam(String teamId) throws SynapseException;
	void addTeamMember(String teamId, String memberId) throws SynapseException;
	PaginatedResults getTeamMembers(String teamId, String fragment, long limit, long offset) throws SynapseException;
	void removeTeamMember(String teamId, String memberId) throws SynapseException;
	
	MembershipInvtnSubmission createMembershipInvitation(MembershipInvtnSubmission invitation) throws SynapseException;
	MembershipInvtnSubmission getMembershipInvitation(String invitationId) throws SynapseException;
	PaginatedResults getOpenMembershipInvitations(String memberId, String teamId, long limit, long offset) throws SynapseException;
	void deleteMembershipInvitation(String invitationId) throws SynapseException;
	
	MembershipRqstSubmission createMembershipRequest(MembershipRqstSubmission request) throws SynapseException;
	MembershipRqstSubmission getMembershipRequest(String requestId) throws SynapseException;
	PaginatedResults getOpenMembershipRequests(String teamId, String requestorId, long limit, long offset) throws SynapseException;
	void deleteMembershipRequest(String requestId) throws SynapseException;

	
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a

	/**
	 * Get the List of ColumnModels for TableEntity given the TableEntity's ID.
Solution content 
	 */
	UserEvaluationPermissions getUserEvaluationPermissions(String evalId)
			throws SynapseException;
	
	/**
	 * Create a new ColumnModel. If a column already exists with the same parameters,
	 * that column will be returned.
	 * @param model
	 * @return
	 * @throws SynapseException 
	ColumnModel createColumnModel(ColumnModel model) throws SynapseException;
	
	/**
	 * Get a ColumnModel from its ID.
	 * 
	 * @param columnId
	 * @return
	 * @throws SynapseException
	 */
	ColumnModel getColumnModel(String columnId) throws SynapseException;
	
	// Team services
	Team createTeam(Team team) throws SynapseException;
	Team getTeam(String id) throws SynapseException;
	PaginatedResults getTeams(String fragment, long limit, long offset) throws SynapseException;
	PaginatedResults getTeamsForUser(String memberId, long limit, long offset) throws SynapseException;
	URL getTeamIcon(String teamId, Boolean redirect) throws SynapseException;
	Team updateTeam(Team team) throws SynapseException;
	void deleteTeam(String teamId) throws SynapseException;
	void addTeamMember(String teamId, String memberId) throws SynapseException;
	PaginatedResults getTeamMembers(String teamId, String fragment, long limit, long offset) throws SynapseException;
	void removeTeamMember(String teamId, String memberId) throws SynapseException;
	
	MembershipInvtnSubmission createMembershipInvitation(MembershipInvtnSubmission invitation) throws SynapseException;
	MembershipInvtnSubmission getMembershipInvitation(String invitationId) throws SynapseException;
	PaginatedResults getOpenMembershipInvitations(String memberId, String teamId, long limit, long offset) throws SynapseException;
	void deleteMembershipInvitation(String invitationId) throws SynapseException;
	
	MembershipRqstSubmission createMembershipRequest(MembershipRqstSubmission request) throws SynapseException;
	MembershipRqstSubmission getMembershipRequest(String requestId) throws SynapseException;
	PaginatedResults getOpenMembershipRequests(String teamId, String requestorId, long limit, long offset) throws SynapseException;
	void deleteMembershipRequest(String requestId) throws SynapseException;


	/**
	 * Get the List of ColumnModels for TableEntity given the TableEntity's ID.
File
SynapseClient.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public ColumnModel createColumnModel(ColumnModel model) throws SynapseException {
		if(model == null) throw new IllegalArgumentException("ColumnModel cannot be null");
		String url = COLUMN;
		return createJSONEntity(url, model);
	}

	@Override
	public ColumnModel getColumnModel(String columnId) throws SynapseException {
		if(columnId == null) throw new IllegalArgumentException("ColumnId cannot be null");
		String url = COLUMN+"/"+columnId;
		try {
			return getJSONEntity(url, ColumnModel.class);
=======
	public Team createTeam(Team team)  throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(team);
			jsonObj = createJSONObject(TEAM, jsonObj);
			return initializeFromJSONObject(jsonObj, Team.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team getTeam(String id) throws SynapseException {
		JSONObject jsonObj = getEntity(TEAM+"/"+id);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		Team results = new Team();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
Solution content 
		}
	}
	}

	@Override
	public ColumnModel createColumnModel(ColumnModel model) throws SynapseException {
		if(model == null) throw new IllegalArgumentException("ColumnModel cannot be null");
		String url = COLUMN;
		return createJSONEntity(url, model);
	}

	@Override
	public ColumnModel getColumnModel(String columnId) throws SynapseException {
		if(columnId == null) throw new IllegalArgumentException("ColumnId cannot be null");
		String url = COLUMN+"/"+columnId;
		try {
			return getJSONEntity(url, ColumnModel.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}
	
	@Override
	public List getColumnModelsForTableEntity(String tableEntityId) throws SynapseException {
		if(tableEntityId == null) throw new IllegalArgumentException("tableEntityId cannot be null");
		String url = ENTITY+"/"+tableEntityId+COLUMN;
		try {
			PaginatedColumnModels pcm =  getJSONEntity(url, PaginatedColumnModels.class);
			return pcm.getResults();
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}
	
	@Override
	public PaginatedColumnModels listColumnModels(String prefix, Long limit, Long offset) throws SynapseException {
		String url = buildListColumnModelUrl(prefix, limit, offset);
		try {
			return  getJSONEntity(url, PaginatedColumnModels.class);
			
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	/**
	 * Build up the URL for listing all ColumnModels
	 * @param prefix
	 * @param limit
	 * @param offset
	 * @return
	 */
	static String buildListColumnModelUrl(String prefix, Long limit, Long offset) {
		StringBuilder builder = new StringBuilder();
		builder.append(COLUMN);
		int count =0;
		if(prefix != null || limit != null || offset != null){
			builder.append("?");
		}
		if(prefix != null){
			builder.append("prefix=");
			builder.append(prefix);
			count++;
		}
		if(limit != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("limit=");
			builder.append(limit);
			count++;
		}
		if(offset != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("offset=");
			builder.append(offset);
		}
		return builder.toString();
	}
	
	@Override
	public Team createTeam(Team team)  throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(team);
			jsonObj = createJSONObject(TEAM, jsonObj);
			return initializeFromJSONObject(jsonObj, Team.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team getTeam(String id) throws SynapseException {
		JSONObject jsonObj = getEntity(TEAM+"/"+id);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		Team results = new Team();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);


	@Override
	public PaginatedResults getTeams(String fragment, long limit,
			long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getTeamsForUser(String memberId, long limit,
			long offset) throws SynapseException {
		String uri = USER+"/"+memberId+TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}
	
	@Override
	public URL getTeamIcon(String teamId, Boolean redirect)
			throws SynapseException {
		String uri = null;
		if (redirect==null) {
			uri = TEAM+"/"+teamId+ICON;
		} else {
			uri = TEAM+"/"+teamId+ICON+"?"+REDIRECT_PARAMETER+redirect;
		}
		try {
			return getUrl(getRepoEndpoint()+uri);
		} catch (IOException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team updateTeam(Team team) throws SynapseException {
		JSONObjectAdapter toUpdateAdapter = new JSONObjectAdapterImpl();
		JSONObject obj;
		try {
			obj = new JSONObject(team.writeToJSONObject(toUpdateAdapter).toJSONString());
			JSONObject jsonObj = putJSONObject(TEAM, obj, new HashMap());
			JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
			return new Team(adapter);
		} catch (JSONException e1) {
			throw new RuntimeException(e1);
		} catch (JSONObjectAdapterException e1) {
			throw new RuntimeException(e1);
		}
	}

	@Override
	public void deleteTeam(String teamId) throws SynapseException {
		deleteUri(TEAM+"/"+teamId);
	}

	@Override
	public void addTeamMember(String teamId, String memberId)
			throws SynapseException {
		putJSONObject(TEAM+"/"+teamId+MEMBER+"/"+memberId, new JSONObject(), new HashMap());
	}
	
	private static String urlEncode(String s) {
		try {
			return URLEncoder.encode(s, "UTF-8");
		} catch (UnsupportedEncodingException e) {
			throw new RuntimeException(e);
		}
	}

	@Override
	public PaginatedResults getTeamMembers(String teamId, String fragment,
			long limit, long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"/"+teamId+MEMBER+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+MEMBER+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+
					"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
			String teamId, String requestorId, long limit, long offset)
		PaginatedResults results = new PaginatedResults(UserGroupHeader.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void removeTeamMember(String teamId, String memberId)
			throws SynapseException {
		deleteUri(TEAM+"/"+teamId+MEMBER+"/"+memberId);
	}

	@Override
	public MembershipInvtnSubmission createMembershipInvitation(
			MembershipInvtnSubmission invitation) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(invitation);
			jsonObj = createJSONObject(MEMBERSHIP_INVITATION, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipInvtnSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipInvtnSubmission getMembershipInvitation(String invitationId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_INVITATION+"/"+invitationId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipInvtnSubmission results = new MembershipInvtnSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getOpenMembershipInvitations(
			String memberId, String teamId, long limit, long offset)
			throws SynapseException {
		
		String uri = null;
		if (teamId==null) {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+TEAM_ID_REQUEST_PARAMETER+"="+teamId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipInvitation.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipInvitation(String invitationId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_INVITATION+"/"+invitationId);
	}

	@Override
	public MembershipRqstSubmission createMembershipRequest(
			MembershipRqstSubmission request) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(request);
			jsonObj = createJSONObject(MEMBERSHIP_REQUEST, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipRqstSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipRqstSubmission getMembershipRequest(String requestId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_REQUEST+"/"+requestId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipRqstSubmission results = new MembershipRqstSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getOpenMembershipRequests(
			throws SynapseException {
		String uri = null;
		if (requestorId==null) {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+REQUESTOR_ID_REQUEST_PARAMETER+"="+requestorId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipRequest.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipRequest(String requestId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_REQUEST+"/"+requestId);
	}

}
File
SynapseClientImpl.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
If statement
Method declaration
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public List getColumnModelsForTableEntity(String tableEntityId) throws SynapseException {
		if(tableEntityId == null) throw new IllegalArgumentException("tableEntityId cannot be null");
		String url = ENTITY+"/"+tableEntityId+COLUMN;
		try {
			PaginatedColumnModels pcm =  getJSONEntity(url, PaginatedColumnModels.class);
			return pcm.getResults();
=======
	public PaginatedResults getTeams(String fragment, long limit,
			long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
Solution content 
	@Override
	public List getColumnModelsForTableEntity(String tableEntityId) throws SynapseException {
		if(tableEntityId == null) throw new IllegalArgumentException("tableEntityId cannot be null");
		String url = ENTITY+"/"+tableEntityId+COLUMN;
		try {
			PaginatedColumnModels pcm =  getJSONEntity(url, PaginatedColumnModels.class);
			return pcm.getResults();
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
File
SynapseClientImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
	}

	@Override
<<<<<<< HEAD
	public PaginatedColumnModels listColumnModels(String prefix, Long limit, Long offset) throws SynapseException {
		String url = buildListColumnModelUrl(prefix, limit, offset);
		try {
			return  getJSONEntity(url, PaginatedColumnModels.class);
=======
	public PaginatedResults getTeamsForUser(String memberId, long limit,
			long offset) throws SynapseException {
		String uri = USER+"/"+memberId+TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
Solution content 
	}
	
	@Override
	public PaginatedColumnModels listColumnModels(String prefix, Long limit, Long offset) throws SynapseException {
		String url = buildListColumnModelUrl(prefix, limit, offset);
		try {
			return  getJSONEntity(url, PaginatedColumnModels.class);
			
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
File
SynapseClientImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	/**
	 * Build up the URL for listing all ColumnModels
	 * @param prefix
	 * @param limit
	 * @param offset
	 * @return
	 */
	static String buildListColumnModelUrl(String prefix, Long limit, Long offset) {
		StringBuilder builder = new StringBuilder();
		builder.append(COLUMN);
		int count =0;
		if(prefix != null || limit != null || offset != null){
			builder.append("?");
		}
		if(prefix != null){
			builder.append("prefix=");
			builder.append(prefix);
			count++;
		}
		if(limit != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("limit=");
			builder.append(limit);
			count++;
		}
		if(offset != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("offset=");
			builder.append(offset);
		}
		return builder.toString();
	}
	
=======
	@Override
	public URL getTeamIcon(String teamId, Boolean redirect)
			throws SynapseException {
		String uri = null;
		if (redirect==null) {
			uri = TEAM+"/"+teamId+ICON;
		} else {
			uri = TEAM+"/"+teamId+ICON+"?"+REDIRECT_PARAMETER+redirect;
		}
		try {
			return getUrl(getRepoEndpoint()+uri);
		} catch (IOException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team updateTeam(Team team) throws SynapseException {
		JSONObjectAdapter toUpdateAdapter = new JSONObjectAdapterImpl();
		JSONObject obj;
		try {
			obj = new JSONObject(team.writeToJSONObject(toUpdateAdapter).toJSONString());
			JSONObject jsonObj = putJSONObject(TEAM, obj, new HashMap());
			JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
			return new Team(adapter);
		} catch (JSONException e1) {
			throw new RuntimeException(e1);
		} catch (JSONObjectAdapterException e1) {
			throw new RuntimeException(e1);
		}
	}

	@Override
	public void deleteTeam(String teamId) throws SynapseException {
		deleteUri(TEAM+"/"+teamId);
	}

	@Override
	public void addTeamMember(String teamId, String memberId)
			throws SynapseException {
		putJSONObject(TEAM+"/"+teamId+MEMBER+"/"+memberId, new JSONObject(), new HashMap());
	}
	
	private static String urlEncode(String s) {
		try {
			return URLEncoder.encode(s, "UTF-8");
		} catch (UnsupportedEncodingException e) {
			throw new RuntimeException(e);
		}
	}

	@Override
	public PaginatedResults getTeamMembers(String teamId, String fragment,
			long limit, long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"/"+teamId+MEMBER+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+MEMBER+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+
					"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(UserGroupHeader.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void removeTeamMember(String teamId, String memberId)
			throws SynapseException {
		deleteUri(TEAM+"/"+teamId+MEMBER+"/"+memberId);
	}

	@Override
	public MembershipInvtnSubmission createMembershipInvitation(
			MembershipInvtnSubmission invitation) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(invitation);
			jsonObj = createJSONObject(MEMBERSHIP_INVITATION, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipInvtnSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipInvtnSubmission getMembershipInvitation(String invitationId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_INVITATION+"/"+invitationId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipInvtnSubmission results = new MembershipInvtnSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getOpenMembershipInvitations(
			String memberId, String teamId, long limit, long offset)
			throws SynapseException {
		
		String uri = null;
		if (teamId==null) {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+TEAM_ID_REQUEST_PARAMETER+"="+teamId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipInvitation.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipInvitation(String invitationId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_INVITATION+"/"+invitationId);
	}

	@Override
	public MembershipRqstSubmission createMembershipRequest(
			MembershipRqstSubmission request) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(request);
			jsonObj = createJSONObject(MEMBERSHIP_REQUEST, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipRqstSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipRqstSubmission getMembershipRequest(String requestId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_REQUEST+"/"+requestId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipRqstSubmission results = new MembershipRqstSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getOpenMembershipRequests(
			String teamId, String requestorId, long limit, long offset)
			throws SynapseException {
		String uri = null;
		if (requestorId==null) {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+REQUESTOR_ID_REQUEST_PARAMETER+"="+requestorId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipRequest.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipRequest(String requestId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_REQUEST+"/"+requestId);
	}


>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
}
Solution content 
	static String buildListColumnModelUrl(String prefix, Long limit, Long offset) {
	@Override
		}
	}

	/**
	 * Build up the URL for listing all ColumnModels
	 * @param prefix
	 * @param limit
	 * @param offset
	 * @return
	 */
		StringBuilder builder = new StringBuilder();
		builder.append(COLUMN);
		int count =0;
		if(prefix != null || limit != null || offset != null){
			builder.append("?");
		}
		if(prefix != null){
			builder.append("prefix=");
			builder.append(prefix);
			count++;
		}
		if(limit != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("limit=");
			builder.append(limit);
			count++;
		}
		if(offset != null){
			if(count > 0){
				builder.append("&");
			}
			builder.append("offset=");
			builder.append(offset);
		}
		return builder.toString();
	}
	
	@Override
	public Team createTeam(Team team)  throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(team);
			jsonObj = createJSONObject(TEAM, jsonObj);
			return initializeFromJSONObject(jsonObj, Team.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team getTeam(String id) throws SynapseException {
		JSONObject jsonObj = getEntity(TEAM+"/"+id);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		Team results = new Team();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}


	@Override
	public PaginatedResults getTeams(String fragment, long limit,
			long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getTeamsForUser(String memberId, long limit,
			long offset) throws SynapseException {
		String uri = USER+"/"+memberId+TEAM+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(Team.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}
	
	@Override
	public URL getTeamIcon(String teamId, Boolean redirect)
			throws SynapseException {
		String uri = null;
		if (redirect==null) {
			uri = TEAM+"/"+teamId+ICON;
		} else {
			uri = TEAM+"/"+teamId+ICON+"?"+REDIRECT_PARAMETER+redirect;
		}
		try {
			return getUrl(getRepoEndpoint()+uri);
		} catch (IOException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public Team updateTeam(Team team) throws SynapseException {
		JSONObjectAdapter toUpdateAdapter = new JSONObjectAdapterImpl();
		JSONObject obj;
		try {
			obj = new JSONObject(team.writeToJSONObject(toUpdateAdapter).toJSONString());
			JSONObject jsonObj = putJSONObject(TEAM, obj, new HashMap());
			JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
			return new Team(adapter);
		} catch (JSONException e1) {
			throw new RuntimeException(e1);
		} catch (JSONObjectAdapterException e1) {
			throw new RuntimeException(e1);
		}
	}

	@Override
	public void deleteTeam(String teamId) throws SynapseException {
		deleteUri(TEAM+"/"+teamId);
	}

	@Override
	public void addTeamMember(String teamId, String memberId)
			throws SynapseException {
		putJSONObject(TEAM+"/"+teamId+MEMBER+"/"+memberId, new JSONObject(), new HashMap());
	}
	
	private static String urlEncode(String s) {
		try {
			return URLEncoder.encode(s, "UTF-8");
		} catch (UnsupportedEncodingException e) {
			throw new RuntimeException(e);
		}
	}

	@Override
	public PaginatedResults getTeamMembers(String teamId, String fragment,
			long limit, long offset) throws SynapseException {
		String uri = null;
		if (fragment==null) {
			uri = TEAM+"/"+teamId+MEMBER+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+MEMBER+"?"+NAME_FRAGMENT_FILTER+"="+urlEncode(fragment)+
					"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(UserGroupHeader.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void removeTeamMember(String teamId, String memberId)
			throws SynapseException {
		deleteUri(TEAM+"/"+teamId+MEMBER+"/"+memberId);
	}

	@Override
	public MembershipInvtnSubmission createMembershipInvitation(
			MembershipInvtnSubmission invitation) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(invitation);
			jsonObj = createJSONObject(MEMBERSHIP_INVITATION, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipInvtnSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipInvtnSubmission getMembershipInvitation(String invitationId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_INVITATION+"/"+invitationId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipInvtnSubmission results = new MembershipInvtnSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public PaginatedResults getOpenMembershipInvitations(
			String memberId, String teamId, long limit, long offset)
			throws SynapseException {
		
		String uri = null;
		if (teamId==null) {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = USER+"/"+memberId+OPEN_MEMBERSHIP_INVITATION+"?"+TEAM_ID_REQUEST_PARAMETER+"="+teamId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipInvitation.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipInvitation(String invitationId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_INVITATION+"/"+invitationId);
	}

	@Override
	public MembershipRqstSubmission createMembershipRequest(
			MembershipRqstSubmission request) throws SynapseException {
		try {
			JSONObject jsonObj = EntityFactory.createJSONObjectForEntity(request);
			jsonObj = createJSONObject(MEMBERSHIP_REQUEST, jsonObj);
			return initializeFromJSONObject(jsonObj, MembershipRqstSubmission.class);
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public MembershipRqstSubmission getMembershipRequest(String requestId)
			throws SynapseException {
		JSONObject jsonObj = getEntity(MEMBERSHIP_REQUEST+"/"+requestId);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		MembershipRqstSubmission results = new MembershipRqstSubmission();
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	public PaginatedResults getOpenMembershipRequests(
			String teamId, String requestorId, long limit, long offset)
			throws SynapseException {
		String uri = null;
		if (requestorId==null) {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		} else {
			uri = TEAM+"/"+teamId+OPEN_MEMBERSHIP_REQUEST+"?"+REQUESTOR_ID_REQUEST_PARAMETER+"="+requestorId+"&"+OFFSET+"="+offset+"&"+LIMIT+"="+limit;
		
		}
		JSONObject jsonObj = getEntity(uri);
		JSONObjectAdapter adapter = new JSONObjectAdapterImpl(jsonObj);
		PaginatedResults results = new PaginatedResults(MembershipRequest.class);
		try {
			results.initializeFromJSONObject(adapter);
			return results;
		} catch (JSONObjectAdapterException e) {
			throw new SynapseException(e);
		}
	}

	@Override
	public void deleteMembershipRequest(String requestId)
			throws SynapseException {
		deleteUri(MEMBERSHIP_REQUEST+"/"+requestId);
	}

}
File
SynapseClientImpl.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_HANDLE =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT_HANDLES;
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_FILE =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT;
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_FILE_PREVIEW =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT_PREVIEW;
<<<<<<< HEAD
	
	// Tables
	public static final String COLUMN = "/column";
	public static final String COLUMN_ID = COLUMN+"/{columnId}";
	public static final String ENTITY_COLUMNS = ENTITY_ID+COLUMN;
=======

	
	// Team
	public static final String TEAM = "/team";
	public static final String TEAM_ID = TEAM+ID;
	public static final String USER_TEAM = USER+ID+TEAM;
	public static final String NAME_FRAGMENT_FILTER = "fragment";
	public static final String TEAM_ID_ICON = TEAM_ID+"/icon";
	private static final String MEMBER = "/member";
	public static final String PRINCIPAL_ID_PATH_VARIABLE = "principalId";
	public static final String PRINCIPAL_ID = "/{"+PRINCIPAL_ID_PATH_VARIABLE+"}";
	public static final String TEAM_ID_MEMBER = TEAM_ID+MEMBER;
	public static final String TEAM_ID_MEMBER_ID = TEAM_ID_MEMBER+PRINCIPAL_ID;
	// membership invitation
	public static final String MEMBERSHIP_INVITATION = "/membershipInvitation";
	public static final String MEMBERSHIP_INVITATION_ID = MEMBERSHIP_INVITATION+ID;
	public static final String OPEN_MEMBERSHIP_INVITATION = USER+ID+"/openInvitation";
	public static final String TEAM_ID_REQUEST_PARAMETER = "teamId";
	// membership request
	public static final String MEMBERSHIP_REQUEST = "/membershipRequest";
	public static final String MEMBERSHIP_REQUEST_ID = MEMBERSHIP_REQUEST+ID;
	public static final String OPEN_MEMBERSHIP_REQUEST = TEAM_ID+"/openRequest";
	public static final String REQUESTOR_ID_REQUEST_PARAMETER = "requestorId";
	
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
	
	/**
	 * APIs for DynamoDB related operations.
Solution content 
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_HANDLE =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT_HANDLES;
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_FILE =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT;
	public static final String EVALUATION_WIKI_ID_ATTCHMENT_FILE_PREVIEW =EVALUATION_OWNER_ID + WIKI_WITH_ID+ATTACHMENT_PREVIEW;	
	// Tables
	public static final String COLUMN = "/column";
	public static final String COLUMN_ID = COLUMN+"/{columnId}";
	public static final String ENTITY_COLUMNS = ENTITY_ID+COLUMN;
	
	// Team
	public static final String TEAM = "/team";
	public static final String TEAM_ID = TEAM+ID;
	public static final String USER_TEAM = USER+ID+TEAM;
	public static final String NAME_FRAGMENT_FILTER = "fragment";
	public static final String TEAM_ID_ICON = TEAM_ID+"/icon";
	private static final String MEMBER = "/member";
	public static final String PRINCIPAL_ID_PATH_VARIABLE = "principalId";
	public static final String PRINCIPAL_ID = "/{"+PRINCIPAL_ID_PATH_VARIABLE+"}";
	public static final String TEAM_ID_MEMBER = TEAM_ID+MEMBER;
	public static final String TEAM_ID_MEMBER_ID = TEAM_ID_MEMBER+PRINCIPAL_ID;
	// membership invitation
	public static final String MEMBERSHIP_INVITATION = "/membershipInvitation";
	public static final String MEMBERSHIP_INVITATION_ID = MEMBERSHIP_INVITATION+ID;
	public static final String OPEN_MEMBERSHIP_INVITATION = USER+ID+"/openInvitation";
	public static final String TEAM_ID_REQUEST_PARAMETER = "teamId";
	// membership request
	public static final String MEMBERSHIP_REQUEST = "/membershipRequest";
	public static final String MEMBERSHIP_REQUEST_ID = MEMBERSHIP_REQUEST+ID;
	public static final String OPEN_MEMBERSHIP_REQUEST = TEAM_ID+"/openRequest";
	public static final String REQUESTOR_ID_REQUEST_PARAMETER = "requestorId";
	
	/**
	 * APIs for DynamoDB related operations.
File
UrlHelpers.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
	@Autowired
	private MigrationService migrationService;
	@Autowired
<<<<<<< HEAD
	private TableServices tableServices;
=======
	private TeamService teamService;
	@Autowired
	private MembershipInvitationService membershipInvitationService;
	@Autowired
	private MembershipRequestService membershipRequestService;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a

	public AccessApprovalService getAccessApprovalService() {
		return accessApprovalService;
Solution content 
	@Autowired
	private MigrationService migrationService;
	@Autowired
	private TableServices tableServices;
	@Autowired
	private TeamService teamService;
	@Autowired
	private MembershipInvitationService membershipInvitationService;
	@Autowired
	private MembershipRequestService membershipRequestService;

	public AccessApprovalService getAccessApprovalService() {
		return accessApprovalService;
File
ServiceProviderImpl.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
		return migrationService;
	}
	@Override
<<<<<<< HEAD
	public TableServices getTableServices() {
		return tableServices;
	}
=======
	public TeamService getTeamService() {
		return teamService;
	}
	@Override
	public MembershipInvitationService getMembershipInvitationService() {
		return membershipInvitationService;
	}
	@Override
	public MembershipRequestService getMembershipRequestService() {
		return membershipRequestService;
	}

>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
}
Solution content 
		return migrationService;
	}
	@Override
	public TableServices getTableServices() {
		return tableServices;
	}
	@Override
	public TeamService getTeamService() {
		return teamService;
	}
	@Override
	public MembershipInvitationService getMembershipInvitationService() {
		return membershipInvitationService;
	}
	@Override
	public MembershipRequestService getMembershipRequestService() {
		return membershipRequestService;
	}

}
File
ServiceProviderImpl.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
<<<<<<< HEAD
import java.util.Set;
=======
import java.util.Map;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
Solution content 
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
File
MigrationIntegrationAutowireTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.sagebionetworks.repo.model.migration.RowMetadata;
import org.sagebionetworks.repo.model.migration.RowMetadataResult;
import org.sagebionetworks.repo.model.provenance.Activity;
<<<<<<< HEAD
import org.sagebionetworks.repo.model.table.ColumnModel;
import org.sagebionetworks.repo.model.table.ColumnType;
=======
import org.sagebionetworks.repo.model.v2.dao.V2WikiPageDao;
import org.sagebionetworks.repo.model.v2.wiki.V2WikiPage;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
import org.sagebionetworks.repo.model.wiki.WikiPage;
import org.sagebionetworks.repo.web.NotFoundException;
import org.sagebionetworks.repo.web.controller.DispatchServletSingleton;
Solution content 
import org.sagebionetworks.repo.model.migration.RowMetadata;
import org.sagebionetworks.repo.model.migration.RowMetadataResult;
import org.sagebionetworks.repo.model.provenance.Activity;
import org.sagebionetworks.repo.model.table.ColumnModel;
import org.sagebionetworks.repo.model.table.ColumnType;
import org.sagebionetworks.repo.model.v2.dao.V2WikiPageDao;
import org.sagebionetworks.repo.model.v2.wiki.V2WikiPage;
import org.sagebionetworks.repo.model.wiki.WikiPage;
import org.sagebionetworks.repo.web.NotFoundException;
import org.sagebionetworks.repo.web.controller.DispatchServletSingleton;
File
MigrationIntegrationAutowireTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	private MembershipInvtnSubmissionDAO membershipInvtnSubmissionDAO;
	
	@Autowired
<<<<<<< HEAD
	private ColumnModelDAO columnModelDao;
=======
	private V2WikiPageDao wikiPageDao;
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a

	UserInfo userInfo;
	private String userName;
Solution content 
	private MembershipInvtnSubmissionDAO membershipInvtnSubmissionDAO;
	
	@Autowired
	private ColumnModelDAO columnModelDao;
	@Autowired
	private V2WikiPageDao wikiPageDao;

	UserInfo userInfo;
	private String userName;
File
MigrationIntegrationAutowireTest.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 

	@Override
<<<<<<< HEAD
	public ColumnModel createColumnModel(ColumnModel model) {
=======
	public Team createTeam(Team team) throws SynapseException {
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		// TODO Auto-generated method stub
		return null;
	}
Solution content 

	@Override
	public ColumnModel createColumnModel(ColumnModel model)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}
File
StubSynapseAdministration.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 

	@Override
<<<<<<< HEAD
	public ColumnModel getColumnModel(String columnId) throws SynapseException {
=======
	public Team getTeam(String id) throws SynapseException {
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		// TODO Auto-generated method stub
		return null;
	}
Solution content 

	@Override
	public ColumnModel getColumnModel(String columnId) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}
File
StubSynapseAdministration.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
	}


	@Override
<<<<<<< HEAD
	public List getColumnModelsForTableEntity(String tableEntityId)
			throws SynapseException {
		// TODO Auto-generated method stub
=======
	public PaginatedResults getTeams(String fragment, long limit,
			long offset) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getTeamsForUser(String memberId, long limit,
			long offset) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public URL getTeamIcon(String teamId, Boolean redirect)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public Team updateTeam(Team team) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteTeam(String teamId) throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public void addTeamMember(String teamId, String memberId)
			throws SynapseException {
		// TODO Auto-generated method stub
		


	@Override
	public PaginatedResults getTeamMembers(String teamId, String fragment,
			long limit, long offset) throws SynapseException {
		// TODO Auto-generated method stub
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		return null;
	}
Solution content 
	}


	@Override
		return null;


	@Override
	public Team createTeam(Team team) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public Team getTeam(String id) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getTeams(String fragment, long limit,
			long offset) throws SynapseException {
		// TODO Auto-generated method stub
	public PaginatedResults getTeamsForUser(String memberId, long limit,
			long offset) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public URL getTeamIcon(String teamId, Boolean redirect)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public Team updateTeam(Team team) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteTeam(String teamId) throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public void addTeamMember(String teamId, String memberId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public PaginatedResults getTeamMembers(String teamId,
			String fragment, long limit, long offset) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}
File
StubSynapseAdministration.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
Method declaration
Method signature
Chunk
Conflicting content 

	@Override
<<<<<<< HEAD
	public PaginatedColumnModels listColumnModels(String prefix, Long limit,
			Long offset) throws SynapseException {
=======
	public void removeTeamMember(String teamId, String memberId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public MembershipInvtnSubmission createMembershipInvitation(
			MembershipInvtnSubmission invitation) throws SynapseException {
>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
		// TODO Auto-generated method stub
		return null;
	}
Solution content 

	@Override
	public void removeTeamMember(String teamId, String memberId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public MembershipInvtnSubmission createMembershipInvitation(
			MembershipInvtnSubmission invitation) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}
File
StubSynapseAdministration.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Method signature
Chunk
Conflicting content 
		return null;
	}

<<<<<<< HEAD
=======

	@Override
	public MembershipInvtnSubmission getMembershipInvitation(String invitationId)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getOpenMembershipInvitations(
			String memberId, String teamId, long limit, long offset)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteMembershipInvitation(String invitationId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public MembershipRqstSubmission createMembershipRequest(
			MembershipRqstSubmission request) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public MembershipRqstSubmission getMembershipRequest(String requestId)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getOpenMembershipRequests(
			String teamId, String requestorId, long limit, long offset)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteMembershipRequest(String requestId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}

>>>>>>> 9e88f12d7d53878ceb81d5efc0ff265ef9d4a78a
}
Solution content 
		return null;
	}


	@Override
	public MembershipInvtnSubmission getMembershipInvitation(String invitationId)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getOpenMembershipInvitations(
			String memberId, String teamId, long limit, long offset)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteMembershipInvitation(String invitationId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public MembershipRqstSubmission createMembershipRequest(
			MembershipRqstSubmission request) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public MembershipRqstSubmission getMembershipRequest(String requestId)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedResults getOpenMembershipRequests(
			String teamId, String requestorId, long limit, long offset)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public void deleteMembershipRequest(String requestId)
			throws SynapseException {
		// TODO Auto-generated method stub
		
	}


	@Override
	public List getColumnModelsForTableEntity(String tableEntityId)
			throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}


	@Override
	public PaginatedColumnModels listColumnModels(String prefix, Long limit,
			Long offset) throws SynapseException {
		// TODO Auto-generated method stub
		return null;
	}



}
File
StubSynapseAdministration.java
Developer's decision
Manual
Kind of conflict
Annotation
Method declaration