From 13b4b5082d5150626229fd0641e5fbe138fcdb93 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 13 Nov 2015 14:25:17 -0800 Subject: [PATCH 1/2] Allow to use GWTORM Key classes in plugins To implement dedicated databases in plugin based on GWTORM, keys are needed. Currently they can only be used from classes located in the same package. Changing the modifiers to public allow the plugin to reuse them, without keep using the same package name as in Gerrit core. Change-Id: I5f321aa89dbb9b71945c4bc53151e3d5a26cce74 --- .../main/java/com/google/gerrit/reviewdb/client/Change.java | 2 +- .../java/com/google/gerrit/reviewdb/client/LabelId.java | 4 ++-- .../java/com/google/gerrit/reviewdb/client/PatchSet.java | 6 +++--- 3 files changed, 6 insertions(+), 6 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> { 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(); } From 62712be1d9261ec7f3fa8268c61d7949d3e750b2 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 13 Nov 2015 18:17:06 -0800 Subject: [PATCH 2/2] Make JdbcUtil#port() public This allows us to use it from plugins. Change-Id: I6728ef75d48af078e488cf06f886902d8963c576 --- .../src/main/java/com/google/gerrit/server/schema/JdbcUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }