Projects >> server >>b312ec2f602f91cb49410b2c9890f354b1271c93

Chunk
Conflicting content 
	public static final String AUTHENTICATION_ACCOUNT_DISABLED = "0201";
	public static final String AUTHENTICATION_NEW_ACCOUNT = "0202";
	
<<<<<<< HEAD
	public static final String POST_MISSING_JSON_DATA = "0300";
	public static final String POST_UNKNOWN_REQUEST_TYPE = "0301";
	public static final String POST_MISSING_CLIENT = "0302";
	public static final String POST_INVALID_CAMPAIGN_ID = "0303";
	
	public static final String JSON_MISSING_OR_INVALID_DATE = "0400";
	public static final String JSON_MISSING_OR_INVALID_TIME = "0401";
	public static final String JSON_MISSING_OR_INVALID_TIMEZONE = "0402";
	public static final String JSON_MISSING_OR_INVALID_LOCATION = "0403";
	public static final String JSON_INVALID_LATITUDE = "0404";
	public static final String JSON_INVALID_LONGITUDE = "0405";
	public static final String JSON_INVALID_ACCURACY = "0406";
	public static final String JSON_INVALID_PROVIDER = "0407";
	public static final String JSON_INVALID_LOCATION_STATUS = "0408";
	public static final String JSON_LOCATION_EXISTENCE_PROBLEM = "0409";
	public static final String JSON_INVALID_LOCATION_TIMESTAMP = "0410";
	
	public static final String MOBILITY_MISSING_OR_INVALID_SUBTYPE = "0500";
	public static final String MOBILITY_MISSING_OR_INVALID_MODE = "0501";
	public static final String MOBILITY_MISSING_SENSOR_DATA = "0502";
	public static final String MOBILITY_MISSING_ACCEL_DATA = "0503";
	public static final String MOBILITY_MISSING_OR_INVALID_SPEED = "0504";
	
	public static final String SURVEY_UPLOAD_MISSING_RESPONSES = "0602";
	public static final String SURVEY_UPLOAD_INVALID_RESPONSES = "0603";
	public static final String SURVEY_UPLOAD_INVALID_CAMPAIGN_ID = "0604";
	public static final String SURVEY_UPLOAD_MISSING_OR_INVALID_SURVEY_ID = "0605";
	public static final String SURVEY_UPLOAD_MISSING_OR_INVALID_SURVEY_LAUNCH_CONTEXT = "0606";
	public static final String SURVEY_UPLOAD_INVALID_USER_ROLE = "0607";
	public static final String SURVEY_UPLOAD_CAMPAIGN_STOPPED_REJECT_SURVEY = "0608";
	public static final String SURVEY_UPLOAD_CAMPAIGN_OUT_OF_DATE = "0609";
	public static final String SURVEY_UPLOAD_INVALID_CAMPAIGN_CREATION_DATETIME = "0610";
	
	public static final String SURVEY_RESPONSE_MISSING_OR_INVALID_DATE = "0700";
	public static final String SURVEY_RESPONSE_INVALID_USER = "0701";
	public static final String SURVEY_RESPONSE_INVALID_CAMPAIGN = "0702";
	public static final String SURVEY_RESPONSE_INVALID_PROMPT_ID = "0703";
	public static final String SURVEY_RESPONSE_INVALID_USER_LIST = "0704";
	public static final String SURVEY_RESPONSE_PROMPT_OR_SURVEY_ID_LIST_ERROR = "0705";
	public static final String SURVEY_RESPONSE_INVALID_SURVEY_ID = "0707";
	public static final String SURVEY_RESPONSE_INVALID_COLUMN_ID = "0708";
	public static final String SURVEY_RESPONSE_USER_DOES_NOT_BELONG_TO_CAMPAIGN = "0709";
	public static final String SURVEY_RESPONSE_INVALID_OUTPUT_FORMAT = "0710";
	public static final String SURVEY_RESPONSE_MISSING_START_OR_END_DATE = "0711";
	public static final String SURVEY_RESPONSE_INVALID_PRETTY_PRINT_VALUE = "0712";
	public static final String SURVEY_RESPONSE_INVALID_RETURN_ID_VALUE = "0713";
	public static final String SURVEY_RESPONSE_INVALID_SUPPRESS_METADATA_VALUE = "0714";
	public static final String SURVEY_RESPONSE_INVALID_SORT_ORDER_VALUE = "0715";
	public static final String SURVEY_RESPONSE_CAMPAIGN_RUNNING_STATE_STOPPED = "0716";
	public static final String SURVEY_RESPONSE_PRIVACY_STATE_PRIVATE = "0717";
	public static final String SURVEY_RESPONSE_PARTICIPANT_QUERYING_OTHER_USERS_DATA = "0718";
	public static final String SURVEY_RESPONSE_INSUFFICIENT_PERMISSIONS_TO_CHANGE_PRIVACY_STATE = "0719";
	public static final String SURVEY_RESPONSE_INVALID_SUVEY_KEY_VALUE = "0720";
	public static final String SURVEY_RESPONSE_INVALID_COLLAPSE_VALUE = "0721";
	public static final String SURVEY_RESPONSE_INVALID_PROMPT_ID_VALUE = "0722";
	
	public static final String CAMPAIGN_NO_CAMPAIGNS_FOUND = "0800";
	public static final String CAMPAIGN_GENERAL_CREATION_FAILURE = "0801";
	public static final String CAMPAIGN_INVALID_INITIAL_RUNNING_STATE = "0802";
	public static final String CAMPAIGN_INVALID_INITIAL_PRIVACY_STATE = "0803";
	public static final String CAMPAIGN_INVALID_CAMPAIGN_XML = "0804";
	public static final String CAMPAIGN_UNABLE_TO_ADD_CLASS_TO_CAMPAIGN = "0805";
	public static final String CAMPAIGN_GENERAL_DELETION_FAILURE = "0806";
	public static final String CAMPAIGN_INVALID_URN = "0807";
	public static final String CAMPAIGN_NOT_FOUND = "0808";
	public static final String CAMPAIGN_NOT_ALLOWED_TO_DELETE = "0809";
	public static final String CAMPAIGN_INVALID_OUTPUT_FORMAT_FOR_READ = "0810";
	public static final String CAMPAIGN_INVALID_PRIVACY_STATE_FOR_READ = "0811";
	public static final String CAMPAIGN_INVALID_RUNNING_STATE_FOR_READ = "0812";
	public static final String CAMPAIGN_INVALID_USER_ROLE_FOR_READ = "0813";
	public static final String CAMPAIGN_INVALID_DESCRIPTION = "0814";
	public static final String CAMPAIGN_UPDATE_FAILED = "0815";
	public static final String CAMPAIGN_INSUFFICIENT_PERMISSIONS = "0816";
	public static final String CAMPAIGN_UNKNOWN_PROMPT_ID = "0817";
	public static final String CAMPAIGN_XML_HEADER_CHANGED = "0818";
	public static final String CAMPAIGN_USER_DOES_NOT_BELONG = "0819";
	public static final String CAMPAIGN_MISSING_XML = "0820";
	public static final String CAMPAIGN_MISSING_RUNNING_STATE = "0821";
	public static final String CAMPAIGN_MISSING_PRIVACY_STATE = "0822";
	public static final String CAMPAIGN_MISSING_CLASS_ID_LIST = "0823";
	
	public static final String IMAGE_NOT_FOUND = "0900";
	public static final String IMAGE_NOT_AN_IMAGE = "0901";
	public static final String IMAGE_INVALID_SIZE_PARAMETER = "0902";
	public static final String IMAGE_INVALID_UUID = "0903";
	
	public static final String DATA_POINT_FUNCTION_UNKNOWN_FUNCTION_NAME = "1100";;
	
	public static final String CLASS_GENERAL_ERROR = "1200";
	public static final String CLASS_INVALID_URN = "1201";
	public static final String CLASS_INVALID_NAME = "1202";
	public static final String CLASS_READ_ERROR = "1203";
	public static final String CLASS_INVALID_LIST = "1204";
	public static final String CLASS_UNKNOWN = "1205";
	public static final String CLASS_DOES_NOT_EXIST = "1206";
	public static final String CLASS_INSUFFICIENT_PERMISSIONS = "1207";
	public static final String CLASS_MISSING_CLASS_LIST = "1208";
	public static final String CLASS_ALREADY_EXISTS = "1209";
	public static final String CLASS_ROSTER_MALFORMED = "1210";
	public static final String CLASS_UNKNOWN_ROLE = "1211";
	public static final String CLASS_MISSING_ID = "1212";
	public static final String CLASS_MISSING_NAME_PARAMETER = "1213";
	public static final String CLASS_USER_DOES_NOT_BELONG = "1214";
	public static final String CLASS_INVALID_USER_CLASS_ROLE_LIST = "1215";
=======
	public static final String SERVER_INVALID_JSON = "0300";
	public static final String SERVER_INVALID_CLIENT = "0301";
	public static final String SERVER_INVALID_DATE = "0302";
	public static final String SERVER_INVALID_CAMPAIGN_CREATION_TIMESTAMP = "0303";
	
	public static final String MOBILITY_INVALID_SUBTYPE = "0500";
	public static final String MOBILITY_INVALID_MODE = "0501";
	public static final String MOBILITY_INVALID_ACCELEROMETER_DATA = "0502";
	public static final String MOBILITY_INVALID_SPEED = "0503";
	
	public static final String SURVEY_INVALID_RESPONSES = "0600";
	public static final String SURVEY_INVALID_OUTPUT_FORMAT = "0601";
	public static final String SURVEY_INVALID_PRETTY_PRINT_VALUE = "0602";
	public static final String SURVEY_INVALID_SURVEY_ID = "0603";
	public static final String SURVEY_INVALID_PROMPT_ID = "0604";
	public static final String SURVEY_INVALID_COLUMN_ID = "0605";
	public static final String SURVEY_INVALID_PRIVACY_STATE = "0606";
	public static final String SURVEY_INVALID_SORT_ORDER = "0607";
	public static final String SURVEY_INVALID_SUPPRESS_METADATA_VALUE = "0608";
	public static final String SURVEY_INVALID_RETURN_ID = "0609";
	public static final String SURVEY_INVALID_COLLAPSE_VALUE = "0610";
	public static final String SURVEY_INVALID_SURVEY_KEY_VALUE = "0611";
	public static final String SURVEY_INVALID_SURVEY_FUNCTION_ID = "0612";
	public static final String SURVEY_TOO_MANY_USERS = "0613";
	public static final String SURVEY_NO_USERS = "0614";
	public static final String SURVEY_TOO_MANY_PROMPT_IDS = "0615";
	public static final String SURVEY_TOO_MANY_SURVEY_IDS = "0616";
	public static final String SURVEY_INSUFFICIENT_PERMISSIONS = "0617";
	
	public static final String CAMPAIGN_INVALID_ID = "0700";
	public static final String CAMPAIGN_INVALID_NAME = "0701";
	public static final String CAMPAIGN_INVALID_XML = "0702";
	public static final String CAMPAIGN_INVALID_RUNNING_STATE = "0703";
	public static final String CAMPAIGN_INVALID_PRIVACY_STATE = "0704";
	public static final String CAMPAIGN_INVALID_OUTPUT_FORMAT = "0705";
	public static final String CAMPAIGN_INSUFFICIENT_PERMISSIONS = "0707";
	public static final String CAMPAIGN_XML_HEADER_CHANGED = "0708";
	public static final String CAMPAIGN_INVALID_DESCRIPTION = "0709";
	
	public static final String IMAGE_INVALID_ID = "0800";
	public static final String IMAGE_INVALID_SIZE = "0801";
	public static final String IMAGE_INSUFFICIENT_PERMISSIONS = "0802";
>>>>>>> aa5c5fdd29e6529d2bcb89d8d7b8fdf9328f6391

	public static final String CLASS_INVALID_ID = "0900";
	public static final String CLASS_INVALID_NAME = "0901";
Solution content 
	public static final String AUTHENTICATION_ACCOUNT_DISABLED = "0201";
	public static final String AUTHENTICATION_NEW_ACCOUNT = "0202";

	public static final String SERVER_INVALID_JSON = "0300";
	public static final String SERVER_INVALID_CLIENT = "0301";
	public static final String SERVER_INVALID_DATE = "0302";
	public static final String SERVER_INVALID_CAMPAIGN_CREATION_TIMESTAMP = "0303";
	
	public static final String MOBILITY_INVALID_SUBTYPE = "0500";
	public static final String MOBILITY_INVALID_MODE = "0501";
	public static final String MOBILITY_INVALID_ACCELEROMETER_DATA = "0502";
	public static final String MOBILITY_INVALID_SPEED = "0503";
	
	public static final String SURVEY_INVALID_RESPONSES = "0600";
	public static final String SURVEY_INVALID_OUTPUT_FORMAT = "0601";
	public static final String SURVEY_INVALID_PRETTY_PRINT_VALUE = "0602";
	public static final String SURVEY_INVALID_SURVEY_ID = "0603";
	public static final String SURVEY_INVALID_PROMPT_ID = "0604";
	public static final String SURVEY_INVALID_COLUMN_ID = "0605";
	public static final String SURVEY_INVALID_PRIVACY_STATE = "0606";
	public static final String SURVEY_INVALID_SORT_ORDER = "0607";
	public static final String SURVEY_INVALID_SUPPRESS_METADATA_VALUE = "0608";
	public static final String SURVEY_INVALID_RETURN_ID = "0609";
	public static final String SURVEY_INVALID_COLLAPSE_VALUE = "0610";
	public static final String SURVEY_INVALID_SURVEY_KEY_VALUE = "0611";
	public static final String SURVEY_INVALID_SURVEY_FUNCTION_ID = "0612";
	public static final String SURVEY_TOO_MANY_USERS = "0613";
	public static final String SURVEY_NO_USERS = "0614";
	public static final String SURVEY_TOO_MANY_PROMPT_IDS = "0615";
	public static final String SURVEY_TOO_MANY_SURVEY_IDS = "0616";
	public static final String SURVEY_INSUFFICIENT_PERMISSIONS = "0617";
	
	public static final String CAMPAIGN_INVALID_ID = "0700";
	public static final String CAMPAIGN_INVALID_NAME = "0701";
	public static final String CAMPAIGN_INVALID_XML = "0702";
	public static final String CAMPAIGN_INVALID_RUNNING_STATE = "0703";
	public static final String CAMPAIGN_INVALID_PRIVACY_STATE = "0704";
	public static final String CAMPAIGN_INVALID_OUTPUT_FORMAT = "0705";
	public static final String CAMPAIGN_INSUFFICIENT_PERMISSIONS = "0707";
	public static final String CAMPAIGN_XML_HEADER_CHANGED = "0708";
	public static final String CAMPAIGN_INVALID_DESCRIPTION = "0709";
	
	public static final String IMAGE_INVALID_ID = "0800";
	public static final String IMAGE_INVALID_SIZE = "0801";
	public static final String IMAGE_INSUFFICIENT_PERMISSIONS = "0802";

	public static final String CLASS_INVALID_ID = "0900";
	public static final String CLASS_INVALID_NAME = "0901";
File
ErrorCodes.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
import org.ohmage.request.document.DocumentDeletionRequest;
import org.ohmage.request.document.DocumentReadContentsRequest;
import org.ohmage.request.document.DocumentReadRequest;
<<<<<<< HEAD
import org.ohmage.request.survey.SurveyUploadRequest;
=======
import org.ohmage.request.document.DocumentUpdateRequest;
>>>>>>> aa5c5fdd29e6529d2bcb89d8d7b8fdf9328f6391

/**
 * Request builder from an HTTP request.
Solution content 
import org.ohmage.request.document.DocumentDeletionRequest;
import org.ohmage.request.document.DocumentReadContentsRequest;
import org.ohmage.request.document.DocumentReadRequest;
import org.ohmage.request.document.DocumentUpdateRequest;
import org.ohmage.request.survey.SurveyUploadRequest;

/**
 * Request builder from an HTTP request.
File
RequestBuilder.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
		else if(API_DOCUMENT_READ.equals(requestUri)) {
			return new DocumentReadRequest(httpRequest);
		}
<<<<<<< HEAD
		else if(API_SURVEY_UPLOAD.equals(requestUri)) {
			return new SurveyUploadRequest(httpRequest);
=======
		else if(API_DOCUMENT_READ_CONTENTS.equals(requestUri)) {
			return new DocumentReadContentsRequest(httpRequest);
		}
		else if(API_DOCUMENT_UPDATE.equals(requestUri)) {
			return new DocumentUpdateRequest(httpRequest);
		}
		else if(API_DOCUMENT_DELETE.equals(requestUri)) {
			return new DocumentDeletionRequest(httpRequest);
>>>>>>> aa5c5fdd29e6529d2bcb89d8d7b8fdf9328f6391
		}
		
		// The URI is unknown.
Solution content 
		else if(API_DOCUMENT_READ.equals(requestUri)) {
			return new DocumentReadRequest(httpRequest);
		}
		else if(API_DOCUMENT_READ_CONTENTS.equals(requestUri)) {
			return new DocumentReadContentsRequest(httpRequest);
		}
		else if(API_DOCUMENT_UPDATE.equals(requestUri)) {
			return new DocumentUpdateRequest(httpRequest);
		}
		else if(API_DOCUMENT_DELETE.equals(requestUri)) {
			return new DocumentDeletionRequest(httpRequest);
		}
		//Survey
		else if(API_SURVEY_UPLOAD.equals(requestUri)) {
			return new SurveyUploadRequest(httpRequest);
		}
		
		// The URI is unknown.
File
RequestBuilder.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Return statement