diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-11-20 04:47:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-20 04:47:59 +0000 |
commit | cac9dfee214a5679bc99bee391ce518659a0a98e (patch) | |
tree | 88f6f7a7bea063a6151511b4f00d490945d7dc13 | |
parent | 27542ceec5afb4053f56e7ac5bd8c5783263f34a (diff) | |
parent | 62712be1d9261ec7f3fa8268c61d7949d3e750b2 (diff) |
Merge changes I6728ef75,I5f321aa8 into stable-2.11
* changes:
Make JdbcUtil#port() public
Allow to use GWTORM Key classes in plugins
4 files changed, 7 insertions, 7 deletions
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java index fe2cd968ff..2b1a7cfcc7 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java @@ -106,7 +106,7 @@ public final class Change { private static final long serialVersionUID = 1L; @Column(id = 1) - protected int id; + public int id; protected Id() { } diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java index 9a159664be..f2af5fa6cb 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java @@ -23,9 +23,9 @@ public class LabelId extends StringKey<com.google.gwtorm.client.Key<?>> { public static final LabelId SUBMIT = new LabelId("SUBM"); @Column(id = 1) - protected String id; + public String id; - protected LabelId() { + public LabelId() { } public LabelId(final String n) { diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java index 48623bdfd1..2361b1c91c 100644 --- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java +++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java @@ -32,12 +32,12 @@ public final class PatchSet { private static final long serialVersionUID = 1L; @Column(id = 1) - protected Change.Id changeId; + public Change.Id changeId; @Column(id = 2) - protected int patchSetId; + public int patchSetId; - protected Id() { + public Id() { changeId = new Change.Id(); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java index 90ca43d8c3..2624923a5c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java @@ -26,7 +26,7 @@ public class JdbcUtil { return hostname; } - static String port(String port) { + public static String port(String port) { if (port != null && !port.isEmpty()) { return ":" + port; } |