opendev/gerrit
Code Issues Proposed changes

Merge changes I6728ef75,I5f321aa8 into stable-2.11

Browse Source 
* changes:
  Make JdbcUtil#port() public
  Allow to use GWTORM Key classes in plugins
This commit is contained in:
David Pursehouse
2015-11-20 04:47:59 +00:00
committed by Gerrit Code Review
parent 27542ceec5 62712be1d9
commit cac9dfee21
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java
View File

@@ -106,7 +106,7 @@ public final class Change {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Column(id = 1) @Column(id = 1)
protected int id; public int id;
protected Id() { protected Id() {
} }

4
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java
View File

@@ -23,9 +23,9 @@ public class LabelId extends StringKey<com.google.gwtorm.client.Key<?>> {
public static final LabelId SUBMIT = new LabelId("SUBM"); public static final LabelId SUBMIT = new LabelId("SUBM");
@Column(id = 1) @Column(id = 1)
protected String id; public String id;
protected LabelId() { public LabelId() {
} }
public LabelId(final String n) { public LabelId(final String n) {

6
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java
View File

@@ -32,12 +32,12 @@ public final class PatchSet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Column(id = 1) @Column(id = 1)
protected Change.Id changeId; public Change.Id changeId;
@Column(id = 2) @Column(id = 2)
protected int patchSetId; public int patchSetId;
protected Id() { public Id() {
changeId = new Change.Id(); changeId = new Change.Id();
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java
View File

@@ -26,7 +26,7 @@ public class JdbcUtil {
return hostname; return hostname;
} }
static String port(String port) { public static String port(String port) {
if (port != null && !port.isEmpty()) { if (port != null && !port.isEmpty()) {
return ":" + port; return ":" + port;
} }