opendev/gerrit
Code Issues Proposed changes

Merge "DashboardInfo: Remove constructor"

Browse Source
This commit is contained in:
Edwin Kempin
2017-09-19 13:04:18 +00:00
committed by Gerrit Code Review
parent 648e70850f 4599d219f7
commit f33b5c68c0
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/DashboardInfo.java
View File

@@ -14,8 +14,6 @@
package com.google.gerrit.extensions.api.projects; package com.google.gerrit.extensions.api.projects;
import com.google.common.base.Joiner;
import com.google.gerrit.extensions.restapi.Url;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -34,9 +32,5 @@ public class DashboardInfo {
public String title; public String title;
public List<DashboardSectionInfo> sections = new ArrayList<>(); public List<DashboardSectionInfo> sections = new ArrayList<>();
public DashboardInfo(String ref, String name) { public DashboardInfo() {}
this.ref = ref;
this.path = name;
this.id = Joiner.on(':').join(Url.encode(ref), Url.encode(path));
}
} }

12
gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.server.project;
import static com.google.gerrit.reviewdb.client.RefNames.REFS_DASHBOARDS; import static com.google.gerrit.reviewdb.client.RefNames.REFS_DASHBOARDS;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.base.Strings; import com.google.common.base.Strings;
@@ -32,6 +33,7 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.extensions.restapi.Url;
import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.UrlEncoded; import com.google.gerrit.server.UrlEncoded;
@@ -167,6 +169,14 @@ public class DashboardsCollection
return views; return views;
} }
static DashboardInfo newDashboardInfo(String ref, String path) {
DashboardInfo info = new DashboardInfo();
info.ref = ref;
info.path = path;
info.id = Joiner.on(':').join(Url.encode(ref), Url.encode(path));
return info;
}
static DashboardInfo parse( static DashboardInfo parse(
Project definingProject, Project definingProject,
String refName, String refName,
@@ -174,7 +184,7 @@ public class DashboardsCollection
Config config, Config config,
String project, String project,
boolean setDefault) { boolean setDefault) {
DashboardInfo info = new DashboardInfo(refName, path); DashboardInfo info = newDashboardInfo(refName, path);
info.project = project; info.project = project;
info.definingProject = definingProject.getName(); info.definingProject = definingProject.getName();
String query = config.getString("dashboard", null, "title"); String query = config.getString("dashboard", null, "title");