MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'east825/IDEA-136499'

Browse Source
This commit is contained in:
Mikhail Golubev
2016-02-18 19:11:32 +03:00
parent 65c20d7064 cc88a2fcb5
commit 940a6b3959
12 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tasks/tasks-api/src/com/intellij/tasks/Task.java
+17 -3
View File
@@ -33,15 +33,29 @@ public abstract class Task {
/**
* Global unique task identifier, e.g. IDEA-00001. It's important that its format is consistent with
* {@link TaskRepository#extractId(String)}, because otherwise task won't be updated on its activation.
* Note that this ID is used to find issues and to compare them, so (ideally) it has to be unique.
*
* In some cases task server doesn't offer such global ID (but, for instance, pair (project-name, per-project-id) instead) or it's not
* what users want to see in UI (e.g. notorious <tt>id</tt> and <tt>iid</tt> in Gitlab). In this case you should generate artificial ID
* for internal usage and implement {@link #getPresentableId()}.
*
* @return unique global ID as described
*
* @see com.intellij.tasks.TaskRepository#extractId(String)
* @see com.intellij.tasks.TaskManager#activateTask(Task, boolean)
* @see #getPresentableId()
* @see TaskRepository#extractId(String)
* @see TaskManager#activateTask(Task, boolean)
*/
@NotNull
public abstract String getId();
/**
* @return ID in the form that is suitable for commit messages, dialogs, completion items, etc.
*/
@NotNull
public String getPresentableId() {
return getId();
}
/**
* Short task description.
* @return description
@@ -100,7 +114,7 @@ public abstract class Task {
public final String toString() {
String text;
if (isIssue()) {
text = getId() + ": " + getSummary();
text = getPresentableId() + ": " + getSummary();
} else {
text = getSummary();
}
plugins/tasks/tasks-api/src/com/intellij/tasks/TaskRepository.java
+1 -1
View File
@@ -352,7 +352,7 @@ public abstract class TaskRepository {
@Nullable
public String getTaskComment(@NotNull Task task) {
return isShouldFormatCommitMessage()
? myCommitMessageFormat.replace("{id}", task.getId()).replace("{summary}", task.getSummary())
? myCommitMessageFormat.replace("{id}", task.getPresentableId()).replace("{summary}", task.getSummary())
: null;
}
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/EditTaskDialog.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class EditTaskDialog extends DialogWrapper {
protected EditTaskDialog(Project project, LocalTaskImpl task) {
super(project);
myTask = task;
setTitle("Edit Task " + (task.isIssue() ? task.getId() : ""));
setTitle("Edit Task " + (task.isIssue() ? task.getPresentableId() : ""));
// mySummary.putClientProperty(DialogWrapperPeer.HAVE_INITIAL_SELECTION, "");
mySummary.setText(task.getSummary());
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskAutoCompletionListProvider.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class TaskAutoCompletionListProvider extends TextFieldWithAutoCompletionL
@NotNull
@Override
protected String getLookupString(@NotNull final Task task) {
return task.getId();
return task.getPresentableId();
}
@Override
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/TaskSearchSupport.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class TaskSearchSupport {
final Matcher matcher = getMatcher(pattern);
return ContainerUtil.mapNotNull(tasks, new NullableFunction<Task, Task>() {
public Task fun(Task task) {
return matcher.matches(task.getId()) || matcher.matches(task.getSummary()) ? task : null;
return matcher.matches(task.getPresentableId()) || matcher.matches(task.getSummary()) ? task : null;
}
});
}
plugins/tasks/tasks-core/src/com/intellij/tasks/doc/TaskDocumentationProvider.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class TaskDocumentationProvider extends AbstractDocumentationProvider imp
final Task task = ((TaskPsiElement)element).getTask();
final StringBuilder builder = new StringBuilder();
builder.append("<b>Summary:</b> ").append(task.getSummary()).append("<br>");
builder.append("<b>Id:</b> ").append(task.getId()).append("<br>");
builder.append("<b>Id:</b> ").append(task.getPresentableId()).append("<br>");
if (task.getCreated() != null) {
builder.append("<b>Created at:</b> ").append(task.getCreated()).append("<br>");
}
plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/GitlabRepository.java
+20 -17
View File
@@ -42,14 +42,17 @@ import static com.intellij.tasks.impl.httpclient.TaskResponseUtil.GsonSingleObje
public class GitlabRepository extends NewBaseRepositoryImpl {
@NonNls public static final String REST_API_PATH_PREFIX = "/api/v3/";
private static final Pattern ID_PATTERN = Pattern.compile("\\d+");
@NonNls private static final String TOKEN_HEADER = "PRIVATE-TOKEN";
public static final Gson GSON = TaskGsonUtil.createDefaultBuilder().create();
public static final TypeToken<List<GitlabProject>> LIST_OF_PROJECTS_TYPE = new TypeToken<List<GitlabProject>>() {
};
public static final TypeToken<List<GitlabIssue>> LIST_OF_ISSUES_TYPE = new TypeToken<List<GitlabIssue>>() {
};
public static final GitlabProject UNSPECIFIED_PROJECT = new GitlabProject() {
private static final Pattern ID_PATTERN = Pattern.compile("\\d+");
private static final Gson GSON = TaskGsonUtil.createDefaultBuilder().create();
// @formatter:off
private static final TypeToken<List<GitlabProject>> LIST_OF_PROJECTS_TYPE = new TypeToken<List<GitlabProject>>() {};
private static final TypeToken<List<GitlabIssue>> LIST_OF_ISSUES_TYPE = new TypeToken<List<GitlabIssue>>() {};
// @formatter:on
static final GitlabProject UNSPECIFIED_PROJECT = new GitlabProject() {
@Override
public String getName() {
return "-- all issues created by you --";
@@ -88,7 +91,7 @@ public class GitlabRepository extends NewBaseRepositoryImpl {
@Override
public boolean equals(Object o) {
if (!super.equals(o)) return false;
GitlabRepository repository = (GitlabRepository)o;
final GitlabRepository repository = (GitlabRepository)o;
if (!Comparing.equal(myCurrentProject, repository.myCurrentProject)) return false;
return true;
}
@@ -114,9 +117,7 @@ public class GitlabRepository extends NewBaseRepositoryImpl {
@Override
public Task findTask(@NotNull String id) throws Exception {
// doesn't work now, because Gitlab's REST API doesn't provide endpoint to find task
// by its global ID, only by project ID and task's local ID (iid).
//GitlabIssue issue = fetchIssue(Integer.parseInt(id));
//return issue == null ? null : new GitlabTask(this, issue);
// using only its global ID, it requires both task's global ID AND task's project ID
return null;
}
@@ -155,7 +156,7 @@ public class GitlabRepository extends NewBaseRepositoryImpl {
@SuppressWarnings("UnusedDeclaration")
@NotNull
public GitlabProject fetchProject(int id) throws Exception {
HttpGet request = new HttpGet(getRestApiUrl("project", id));
final HttpGet request = new HttpGet(getRestApiUrl("project", id));
return getHttpClient().execute(request, new GsonSingleObjectDeserializer<GitlabProject>(GSON, GitlabProject.class));
}
@@ -182,12 +183,14 @@ public class GitlabRepository extends NewBaseRepositoryImpl {
return getRestApiUrl("issues");
}
@SuppressWarnings("UnusedDeclaration")
/**
* @param issueId global issue's ID (<tt>id</tt> field, not <tt>iid</tt>)
*/
@Nullable
public GitlabIssue fetchIssue(int id) throws Exception {
public GitlabIssue fetchIssue(int projectId, int issueId) throws Exception {
ensureProjectsDiscovered();
HttpGet request = new HttpGet(getRestApiUrl("issues", id));
ResponseHandler<GitlabIssue> handler = new GsonSingleObjectDeserializer<GitlabIssue>(GSON, GitlabIssue.class, true);
final HttpGet request = new HttpGet(getRestApiUrl("projects", projectId, "issues", issueId));
final ResponseHandler<GitlabIssue> handler = new GsonSingleObjectDeserializer<GitlabIssue>(GSON, GitlabIssue.class, true);
return getHttpClient().execute(request, handler);
}
@@ -223,7 +226,7 @@ public class GitlabRepository extends NewBaseRepositoryImpl {
return new HttpRequestInterceptor() {
@Override
public void process(HttpRequest request, HttpContext context) throws HttpException, IOException {
request.addHeader("PRIVATE-TOKEN", myPassword);
request.addHeader(TOKEN_HEADER, myPassword);
//request.addHeader("Accept", "application/json");
}
};
plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/GitlabTask.java
+8
View File
@@ -37,9 +37,17 @@ public class GitlabTask extends Task {
@NotNull
@Override
public String getId() {
// Will be in form <projectId>:<issueId>
//return myIssue.getProjectId() + ":" + myIssue.getId();
return String.valueOf(myIssue.getId());
}
@NotNull
@Override
public String getPresentableId() {
return "#" + myIssue.getLocalId();
}
@NotNull
@Override
public String getSummary() {
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java
+13
View File
@@ -57,6 +57,7 @@ public class LocalTaskImpl extends LocalTask {
private String myProject = null;
private String myNumber = "";
private String myPresentableId = "";
private boolean myIssue = false;
private TaskRepository myRepository = null;
@@ -161,6 +162,7 @@ public class LocalTaskImpl extends LocalTask {
myProject = issue.getProject();
myNumber = issue.getNumber();
myPresentableId = issue.getPresentableId();
}
public void setId(String id) {
@@ -394,4 +396,15 @@ public class LocalTaskImpl extends LocalTask {
public void setProject(@Nullable String project) {
myProject = project;
}
public void setPresentableId(@NotNull String presentableId) {
myPresentableId = presentableId;
}
@NotNull
@Override
public String getPresentableId() {
// Use global ID for compatibility
return StringUtil.isEmpty(myPresentableId) ? getId() : myPresentableId;
}
}
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
+1 -1
View File
@@ -497,7 +497,7 @@ public class TaskManagerImpl extends TaskManager implements ProjectComponent, Pe
if (task.isIssue()) {
StartupManager.getInstance(myProject).runWhenProjectIsInitialized(new Runnable() {
public void run() {
ProgressManager.getInstance().run(new com.intellij.openapi.progress.Task.Backgroundable(myProject, "Updating " + task.getId()) {
ProgressManager.getInstance().run(new com.intellij.openapi.progress.Task.Backgroundable(myProject, "Updating " + task.getPresentableId()) {
public void run(@NotNull ProgressIndicator indicator) {
updateIssue(task.getId());
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
+2 -2
View File
@@ -72,7 +72,7 @@ public class TaskUtil {
public static String formatTask(@NotNull Task task, String format) {
return format
.replace("{id}", task.getId())
.replace("{id}", task.getPresentableId())
.replace("{number}", task.getNumber())
.replace("{project}", StringUtil.notNullize(task.getProject()))
.replace("{summary}", task.getSummary());
@@ -90,7 +90,7 @@ public class TaskUtil {
public static String getTrimmedSummary(Task task) {
String text;
if (task.isIssue()) {
text = task.getId() + ": " + task.getSummary();
text = task.getPresentableId() + ": " + task.getSummary();
}
else {
text = task.getSummary();
plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/GitlabIntegrationTest.java
+21 -4
View File
@@ -15,7 +15,6 @@ import com.intellij.util.containers.ContainerUtil;
import java.util.Collections;
/**
* TODO: install Gitlab on server and add more functional tests
* @author Mikhail Golubev
*/
public class GitlabIntegrationTest extends TaskManagerTestCase {
@@ -48,14 +47,13 @@ public class GitlabIntegrationTest extends TaskManagerTestCase {
LocalTaskImpl localTask = new LocalTaskImpl(new GitlabTask(myRepository, issue));
String changeListComment = TaskUtil.getChangeListComment(localTask);
assertEquals("project-1 2 1 Sample title", changeListComment);
assertEquals("project-1 2 #2 Sample title", changeListComment);
myRepository.setProjects(Collections.<GitlabProject>emptyList());
localTask = new LocalTaskImpl(new GitlabTask(myRepository, issue));
changeListComment = TaskUtil.getChangeListComment(localTask);
// Project is unknown, so "" is substituted instead
assertEquals(" 2 1 Sample title", changeListComment);
assertEquals(" 2 #2 Sample title", changeListComment);
}
public void testIssueFilteringByState() throws Exception {
@@ -74,6 +72,25 @@ public class GitlabIntegrationTest extends TaskManagerTestCase {
assertEquals("Opened issue #1", openedIssues[0].getSummary());
}
// IDEA-136499
public void testPresentableId() throws Exception {
final GitlabIssue issue = myRepository.fetchIssue(5 /* ID Formatting Tests */, 10);
assertNotNull(issue);
assertEquals(10, issue.getId());
assertEquals(1, issue.getLocalId());
assertEquals(5, issue.getProjectId());
final GitlabTask task = new GitlabTask(myRepository, issue);
assertEquals("#1", task.getPresentableId());
assertEquals("1", task.getNumber());
assertEquals("ID Formatting Tests", task.getProject());
assertEquals("10", task.getId());
assertEquals("#1: First issue with iid = 1", task.toString());
myRepository.setShouldFormatCommitMessage(true);
assertEquals("#1 First issue with iid = 1", myRepository.getTaskComment(task));
}
@Override
public void setUp() throws Exception {
super.setUp();