| Chunk |
|---|
| Conflicting content |
|---|
import org.ohmage.request.document.DocumentReadContentsRequest; import org.ohmage.request.document.DocumentReadRequest; import org.ohmage.request.document.DocumentUpdateRequest; <<<<<<< HEAD import org.ohmage.request.image.ImageReadRequest; ======= import org.ohmage.request.survey.SurveyUploadRequest; >>>>>>> 4497baae7a8c622c9f365bdf89a556c71ab792ac import org.ohmage.request.user.UserChangePasswordRequest; import org.ohmage.request.user.UserCreationRequest; import org.ohmage.request.user.UserDeletionRequest; |
| Solution content |
|---|
import org.ohmage.request.document.DocumentReadContentsRequest; import org.ohmage.request.document.DocumentReadRequest; import org.ohmage.request.document.DocumentUpdateRequest; import org.ohmage.request.image.ImageReadRequest; import org.ohmage.request.survey.SurveyUploadRequest; import org.ohmage.request.user.UserChangePasswordRequest; import org.ohmage.request.user.UserCreationRequest; import org.ohmage.request.user.UserDeletionRequest; |
| File |
|---|
| RequestBuilder.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
public static final String API_DOCUMENT_UPDATE = API_ROOT + "/document/update"; public static final String API_DOCUMENT_DELETE = API_ROOT + "/document/delete"; <<<<<<< HEAD // Image public static final String API_IMAGE_READ = API_ROOT + "/image/read"; ======= // Survey private static final String API_SURVEY_UPLOAD = API_ROOT + "/survey/upload"; >>>>>>> 4497baae7a8c622c9f365bdf89a556c71ab792ac // User public static final String API_USER_CREATE = API_ROOT + "/user/create"; public static final String API_USER_READ = API_ROOT + "/user/read"; |
| Solution content |
|---|
public static final String API_DOCUMENT_UPDATE = API_ROOT + "/document/update"; public static final String API_DOCUMENT_DELETE = API_ROOT + "/document/delete"; // Image public static final String API_IMAGE_READ = API_ROOT + "/image/read"; // Survey private static final String API_SURVEY_UPLOAD = API_ROOT + "/survey/upload"; // User public static final String API_USER_CREATE = API_ROOT + "/user/create"; public static final String API_USER_READ = API_ROOT + "/user/read"; |
| File |
|---|
| RequestBuilder.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
else if(API_DOCUMENT_DELETE.equals(requestUri)) {
return new DocumentDeletionRequest(httpRequest);
}
<<<<<<< HEAD
else if(API_IMAGE_READ.equals(requestUri)) {
return new ImageReadRequest(httpRequest);
=======
//Survey
else if(API_SURVEY_UPLOAD.equals(requestUri)) {
return new SurveyUploadRequest(httpRequest);
>>>>>>> 4497baae7a8c622c9f365bdf89a556c71ab792ac
}
// User
else if(API_USER_CREATE.equals(requestUri)) { |
| Solution content |
|---|
else if(API_DOCUMENT_DELETE.equals(requestUri)) {
return new DocumentDeletionRequest(httpRequest);
}
// Image
else if(API_IMAGE_READ.equals(requestUri)) {
return new ImageReadRequest(httpRequest);
}
//Survey
else if(API_SURVEY_UPLOAD.equals(requestUri)) {
return new SurveyUploadRequest(httpRequest);
}
// User
else if(API_USER_CREATE.equals(requestUri)) { |
| File |
|---|
| RequestBuilder.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Return statement |