opendev
/
gerrit
Code Issues Proposed changes

Isolate gerrit:server rule in gerrit/server package 

Move c.g.g.rules and c.g.g.audit packages to c.g.g.server package to
reflect the real dependencies on server package for these clases.

This allows us to move server code related BUILD rules from general
package c.g.g to c.g.g.server package. With this small refactoring we
can achieve our goal having the BUILD files as close to the sources as
possible. Moreover, this non-intrusive change (no core plugins were
affected) significantly simplifies the whole build structure as this
allows us to eliminate BUILD rule in general c.g.g package.

Before this change a developer must study build files to actually
understand what parts of codes are controlled by c.g.g/BUILD build file.
With this change, it is obvious, because all BUILD files are located as
close as possible to the sources they control.

This changes also leaves place for improvement. At the moment, the
sources can be isolated from the giant java/com/google/gerrit/server
rules, the packages can be moved outside of c.g.g.server package and
de-coupled from java/com/google/gerrit/server rules, as it was already
done with receive, index, metrics and lifecycle packages. These future
and further decomposition of java/com/google/gerrit/server rule is
beyond of the scope of this change.

Change-Id: Iac35422bd9d6ad933c2dded2293c679cdd2aead5
This commit is contained in:
David Ostrovsky 2017-09-21 22:54:20 +02:00 committed by Dave Borowitz
parent 376a7bbb64
commit 590071e7ff
89 changed files with 115 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/acceptance/BUILD
View File

@ -8,7 +8,6 @@ java_library(
visibility = ["//visibility:public"],
exports = [
":framework-lib",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -23,6 +22,7 @@ java_library(
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/sshd",
@ -50,7 +50,6 @@ java_library(
)
PROVIDED = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -59,6 +58,7 @@ PROVIDED = [
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/server/git/receive",
"//lib:gson",

2
java/com/google/gerrit/elasticsearch/BUILD
View File

@ -3,12 +3,12 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:gwtorm",

2
java/com/google/gerrit/gpg/BUILD
View File

@ -3,10 +3,10 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/bouncycastle:bcpg-neverlink",

2
java/com/google/gerrit/httpd/BUILD
View File

@ -5,7 +5,6 @@ java_library(
resources = ["//resources/com/google/gerrit/httpd"],
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -13,6 +12,7 @@ java_library(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/http",

4
java/com/google/gerrit/httpd/HttpLogoutServlet.java
View File

@ -15,12 +15,12 @@
package com.google.gerrit.httpd;
import com.google.common.base.Strings;
import com.google.gerrit.audit.AuditEvent;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.audit.AuditEvent;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;

2
java/com/google/gerrit/httpd/auth/oauth/BUILD
View File

@ -5,11 +5,11 @@ java_library(
resources = ["//resources/com/google/gerrit/httpd/auth/oauth"],
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:gwtorm",

2
java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java
View File

@ -14,11 +14,11 @@
package com.google.gerrit.httpd.auth.oauth;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HttpLogoutServlet;
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;

2
java/com/google/gerrit/httpd/auth/openid/BUILD
View File

@ -12,7 +12,7 @@ java_library(
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gwtexpui/server",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib:servlet-api-3_1",

2
java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java
View File

@ -14,11 +14,11 @@
package com.google.gerrit.httpd.auth.openid;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HttpLogoutServlet;
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;

4
java/com/google/gerrit/httpd/init/BUILD
View File

@ -3,8 +3,6 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:module",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/gpg",
@ -17,6 +15,8 @@ java_library(
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/sshd",

4
java/com/google/gerrit/httpd/restapi/RestApiServlet.java
View File

@ -60,8 +60,6 @@ import com.google.common.io.BaseEncoding;
import com.google.common.io.CountingOutputStream;
import com.google.common.math.IntMath;
import com.google.common.net.HttpHeaders;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.audit.ExtendedHttpAuditEvent;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.RawInputUtil;
import com.google.gerrit.common.TimeUtil;
@ -100,6 +98,8 @@ import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.OptionUtil;
import com.google.gerrit.server.OutputFormat;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.audit.ExtendedHttpAuditEvent;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.permissions.GlobalPermission;
import com.google.gerrit.server.permissions.PermissionBackend;

4
java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
View File

@ -16,8 +16,6 @@ package com.google.gerrit.httpd.rpc;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.audit.RpcAuditEvent;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.audit.Audit;
import com.google.gerrit.common.auth.SignInRequired;
@ -26,6 +24,8 @@ import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.AccessPath;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.audit.RpcAuditEvent;
import com.google.gson.GsonBuilder;
import com.google.gwtjsonrpc.common.RemoteJsonService;
import com.google.gwtjsonrpc.server.ActiveCall;

4
java/com/google/gerrit/lucene/BUILD
View File

@ -5,10 +5,10 @@ java_library(
srcs = QUERY_BUILDER,
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/lucene:lucene-core-and-backward-codecs",
@ -24,7 +24,6 @@ java_library(
visibility = ["//visibility:public"],
deps = [
":query_builder",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -32,6 +31,7 @@ java_library(
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/guice",

2
java/com/google/gerrit/metrics/dropwizard/BUILD
View File

@ -3,10 +3,10 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/server",
"//lib:args4j",
"//lib:guava",
"//lib/dropwizard:dropwizard-core",

4
java/com/google/gerrit/pgm/BUILD
View File

@ -15,8 +15,6 @@ java_library(
resources = ["//resources/com/google/gerrit/pgm"],
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:module",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/elasticsearch",
@ -35,6 +33,8 @@ java_library(
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/sshd",

2
java/com/google/gerrit/pgm/http/jetty/BUILD
View File

@ -3,12 +3,12 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/launcher",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/sshd",
"//java/com/google/gwtexpui/server",
"//lib:guava",

2
java/com/google/gerrit/pgm/init/BUILD
View File

@ -5,7 +5,6 @@ java_library(
resources = ["//resources/com/google/gerrit/pgm/init"],
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/elasticsearch",
@ -17,6 +16,7 @@ java_library(
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtjsonrpc",
"//lib:gwtorm",

2
java/com/google/gerrit/pgm/init/api/BUILD
View File

@ -3,10 +3,10 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/guice",

4
java/com/google/gerrit/pgm/util/BUILD
View File

@ -3,14 +3,14 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:module",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/metrics/dropwizard",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",

2
java/com/google/gerrit/pgm/util/BatchProgramModule.java
View File

@ -26,7 +26,6 @@ import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.rules.PrologModule;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCacheImpl;
@ -71,6 +70,7 @@ import com.google.gerrit.server.project.SectionSortCache;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeQueryProcessor;
import com.google.gerrit.server.rules.PrologModule;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.inject.Inject;
import com.google.inject.Module;

11
java/com/google/gerrit/BUILD → java/com/google/gerrit/server/BUILD
View File

@ -1,14 +1,9 @@
# TODO(davido): Consider to isolate former gerrit-server specific rules
# in server directory. Otherwise it is hard to see the whole dependency
# picture given that this file is located in com/google/gerrit, but only
# controls three directory: audit, rules and server.
CONSTANTS_SRC = [
"server/documentation/Constants.java",
"documentation/Constants.java",
]
GERRIT_GLOBAL_MODULE_SRC = [
"server/config/GerritGlobalModule.java",
"config/GerritGlobalModule.java",
]
java_library(
@ -30,7 +25,7 @@ java_library(
exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC,
),
resource_strip_prefix = "resources",
resources = ["//resources/com/google/gerrit:server"],
resources = ["//resources/com/google/gerrit/server"],
visibility = ["//visibility:public"],
deps = [
":constants",

2
java/com/google/gerrit/audit/AuditEvent.java → java/com/google/gerrit/server/audit/AuditEvent.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.auto.value.AutoValue;
import com.google.common.base.MoreObjects;

2
java/com/google/gerrit/audit/AuditListener.java → java/com/google/gerrit/server/audit/AuditListener.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.annotations.ExtensionPoint;

2
java/com/google/gerrit/audit/AuditModule.java → java/com/google/gerrit/server/audit/AuditModule.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.inject.AbstractModule;

2
java/com/google/gerrit/audit/AuditService.java → java/com/google/gerrit/server/audit/AuditService.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.client.Account;

2
java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java → java/com/google/gerrit/server/audit/ExtendedHttpAuditEvent.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.common.base.Preconditions;
import com.google.common.collect.ListMultimap;

2
java/com/google/gerrit/audit/GroupMemberAuditListener.java → java/com/google/gerrit/server/audit/GroupMemberAuditListener.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
import com.google.gerrit.reviewdb.client.Account;

2
java/com/google/gerrit/audit/HttpAuditEvent.java → java/com/google/gerrit/server/audit/HttpAuditEvent.java
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;

2
java/com/google/gerrit/audit/RpcAuditEvent.java → java/com/google/gerrit/server/audit/RpcAuditEvent.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;

2
java/com/google/gerrit/audit/SshAuditEvent.java → java/com/google/gerrit/server/audit/SshAuditEvent.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.audit;
package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;

2
java/com/google/gerrit/server/cache/h2/BUILD vendored
View File

@ -3,10 +3,10 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:h2",
"//lib/guice",

2
java/com/google/gerrit/server/change/TestSubmitRule.java
View File

@ -23,10 +23,10 @@ import com.google.gerrit.extensions.common.TestSubmitRuleInput.Filters;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.RulesCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;

2
java/com/google/gerrit/server/change/TestSubmitType.java
View File

@ -24,9 +24,9 @@ import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.RulesCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;

6
java/com/google/gerrit/server/config/GerritGlobalModule.java
View File

@ -17,7 +17,6 @@ package com.google.gerrit.server.config;
import static com.google.inject.Scopes.SINGLETON;
import com.google.common.cache.Cache;
import com.google.gerrit.audit.AuditModule;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.api.changes.ActionVisitor;
import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
@ -69,8 +68,6 @@ import com.google.gerrit.extensions.webui.ProjectWebLink;
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.gerrit.extensions.webui.TopMenu;
import com.google.gerrit.extensions.webui.WebUiPlugin;
import com.google.gerrit.rules.PrologModule;
import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeFinder;
@ -93,6 +90,7 @@ import com.google.gerrit.server.account.GroupIncludeCacheImpl;
import com.google.gerrit.server.account.VersionedAuthorizedKeys;
import com.google.gerrit.server.account.externalids.ExternalIdModule;
import com.google.gerrit.server.api.accounts.AccountExternalIdCreator;
import com.google.gerrit.server.audit.AuditModule;
import com.google.gerrit.server.auth.AuthBackend;
import com.google.gerrit.server.auth.UniversalAuthBackend;
import com.google.gerrit.server.auth.oauth.OAuthTokenCache;
@ -172,6 +170,8 @@ import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
import com.google.gerrit.server.query.change.ChangeQueryProcessor;
import com.google.gerrit.server.query.change.ConflictsCacheImpl;
import com.google.gerrit.server.rules.PrologModule;
import com.google.gerrit.server.rules.RulesCache;
import com.google.gerrit.server.ssh.SshAddressesModule;
import com.google.gerrit.server.tools.ToolsCatalog;
import com.google.gerrit.server.update.BatchUpdate;

2
java/com/google/gerrit/server/git/receive/BUILD
View File

@ -3,11 +3,11 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/util/cli",
"//lib:args4j",
"//lib:guava",

2
java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
View File

@ -15,7 +15,6 @@
package com.google.gerrit.server.group;
import com.google.common.base.Joiner;
import com.google.gerrit.audit.GroupMemberAuditListener;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
@ -27,6 +26,7 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.UniversalGroupBackend;
import com.google.gerrit.server.audit.GroupMemberAuditListener;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;

2
java/com/google/gerrit/server/group/Module.java
View File

@ -18,11 +18,11 @@ import static com.google.gerrit.server.group.GroupResource.GROUP_KIND;
import static com.google.gerrit.server.group.MemberResource.MEMBER_KIND;
import static com.google.gerrit.server.group.SubgroupResource.SUBGROUP_KIND;
import com.google.gerrit.audit.GroupMemberAuditListener;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.audit.GroupMemberAuditListener;
import com.google.gerrit.server.group.AddMembers.UpdateMember;
import com.google.gerrit.server.group.AddSubgroups.UpdateSubgroup;
import com.google.gerrit.server.group.DeleteMembers.DeleteMember;

2
java/com/google/gerrit/server/group/db/GroupsUpdate.java
View File

@ -20,7 +20,6 @@ import static com.google.gerrit.server.group.db.Groups.getExistingGroupFromRevie
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.errors.NameAlreadyUsedException;
import com.google.gerrit.common.errors.NoSuchGroupException;
@ -34,6 +33,7 @@ import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.GroupIncludeCache;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.git.RenameGroupOp;
import com.google.gerrit.server.group.InternalGroup;
import com.google.gwtorm.server.OrmException;

4
java/com/google/gerrit/server/project/ProjectState.java
View File

@ -36,8 +36,6 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.config.AllProjectsName;
@ -48,6 +46,8 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.git.ProjectLevelConfig;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.rules.PrologEnvironment;
import com.google.gerrit.server.rules.RulesCache;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.googlecode.prolog_cafe.exceptions.CompileException;

4
java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
View File

@ -24,13 +24,13 @@ import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.Accounts;
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.PrologEnvironment;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

2
java/com/google/gerrit/server/project/testing/BUILD
View File

@ -4,8 +4,8 @@ java_library(
srcs = glob(["*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
],
)

2
java/com/google/gerrit/rules/PredicateClassLoader.java → java/com/google/gerrit/server/rules/PredicateClassLoader.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.SetMultimap;

2
java/com/google/gerrit/rules/PredicateProvider.java → java/com/google/gerrit/server/rules/PredicateProvider.java
View File

@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.annotations.ExtensionPoint;

2
java/com/google/gerrit/rules/PrologEnvironment.java → java/com/google/gerrit/server/rules/PrologEnvironment.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.IdentifiedUser;

2
java/com/google/gerrit/rules/PrologModule.java → java/com/google/gerrit/server/rules/PrologModule.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicSet;

2
java/com/google/gerrit/rules/RulesCache.java → java/com/google/gerrit/server/rules/RulesCache.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import static com.googlecode.prolog_cafe.lang.PrologMachineCopy.save;

2
java/com/google/gerrit/rules/StoredValue.java → java/com/google/gerrit/server/rules/StoredValue.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import com.googlecode.prolog_cafe.exceptions.SystemException;
import com.googlecode.prolog_cafe.lang.Prolog;

4
java/com/google/gerrit/rules/StoredValues.java → java/com/google/gerrit/server/rules/StoredValues.java
View File

@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import static com.google.gerrit.rules.StoredValue.create;
import static com.google.gerrit.server.rules.StoredValue.create;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
import com.google.gerrit.reviewdb.client.Account;

2
java/com/google/gerrit/sshd/BUILD
View File

@ -3,7 +3,6 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -11,6 +10,7 @@ java_library(
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",

4
java/com/google/gerrit/sshd/SshLog.java
View File

@ -16,13 +16,13 @@ package com.google.gerrit.sshd;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.audit.AuditService;
import com.google.gerrit.audit.SshAuditEvent;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PeerDaemonUser;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.audit.SshAuditEvent;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.util.IdGenerator;
import com.google.gerrit.server.util.SystemLog;

4
java/com/google/gerrit/testing/BUILD
View File

@ -12,8 +12,6 @@ java_library(
"//lib/powermock:powermock-module-junit4-common",
],
deps = [
"//java/com/google/gerrit:module",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -23,6 +21,8 @@ java_library(
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//lib:gwtorm",
"//lib:h2",

2
java/gerrit/BUILD
View File

@ -3,10 +3,10 @@ java_library(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:api",

2
java/gerrit/PRED__load_commit_labels_1.java
View File

@ -5,8 +5,8 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_change_branch_1.java
View File

@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;

2
java/gerrit/PRED_change_owner_1.java
View File

@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;

2
java/gerrit/PRED_change_project_1.java
View File

@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;

2
java/gerrit/PRED_change_topic_1.java
View File

@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;

2
java/gerrit/PRED_commit_author_3.java
View File

@ -16,7 +16,7 @@ package gerrit;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.UserIdentity;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Prolog;

2
java/gerrit/PRED_commit_committer_3.java
View File

@ -16,7 +16,7 @@ package gerrit;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.UserIdentity;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Prolog;

2
java/gerrit/PRED_commit_delta_4.java
View File

@ -15,9 +15,9 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_commit_edits_2.java
View File

@ -14,10 +14,10 @@
package gerrit;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.patch.Text;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;

2
java/gerrit/PRED_commit_message_1.java
View File

@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;

2
java/gerrit/PRED_commit_stats_3.java
View File

@ -15,9 +15,9 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;

2
java/gerrit/PRED_current_user_1.java
View File

@ -15,10 +15,10 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.PeerDaemonUser;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.EvaluationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;

4
java/gerrit/PRED_current_user_2.java
View File

@ -17,10 +17,10 @@ package gerrit;
import static com.googlecode.prolog_cafe.lang.SymbolTerm.intern;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.rules.PrologEnvironment;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_get_legacy_label_types_1.java
View File

@ -16,7 +16,7 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_project_default_submit_type_1.java
View File

@ -15,8 +15,8 @@
package gerrit;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;

2
java/gerrit/PRED_pure_revert_1.java
View File

@ -14,7 +14,7 @@
package gerrit;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_unresolved_comments_count_1.java
View File

@ -14,7 +14,7 @@
package gerrit;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;

2
java/gerrit/PRED_uploader_1.java
View File

@ -16,7 +16,7 @@ package gerrit;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;

2
javatests/com/google/gerrit/acceptance/api/group/BUILD
View File

@ -14,9 +14,9 @@ java_library(
name = "util",
srcs = ["GroupAssert.java"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib:truth",
],

3
javatests/com/google/gerrit/acceptance/rest/project/BUILD
View File

@ -17,7 +17,6 @@ java_library(
"RefAssert.java",
],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//lib:truth",
],
@ -29,9 +28,9 @@ java_library(
"ProjectAssert.java",
],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib:truth",
],

6
javatests/com/google/gerrit/elasticsearch/BUILD
View File

@ -5,11 +5,11 @@ java_library(
testonly = 1,
srcs = ["ElasticTestUtils.java"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:junit",
@ -29,11 +29,11 @@ junit_tests(
],
deps = [
":elasticsearch_test_utils",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//javatests/com/google/gerrit:query_tests_code",
"//javatests/com/google/gerrit/server:query_tests_code",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",

2
javatests/com/google/gerrit/gpg/BUILD
View File

@ -5,7 +5,6 @@ junit_tests(
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/gpg",
@ -13,6 +12,7 @@ junit_tests(
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/testing:gerrit-test-util",

2
javatests/com/google/gerrit/httpd/BUILD
View File

@ -4,12 +4,12 @@ junit_tests(
name = "httpd_tests",
srcs = glob(["**/*.java"]),
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/util/http",
"//javatests/com/google/gerrit/util/http/testutil",
"//lib:gson",

2
javatests/com/google/gerrit/pgm/BUILD
View File

@ -5,12 +5,12 @@ junit_tests(
name = "pgm_tests",
srcs = glob(["**/*.java"]),
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/pgm",
"//java/com/google/gerrit/pgm/http",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/server",
"//lib:guava",
"//lib:junit",
"//lib:truth",

14
javatests/com/google/gerrit/BUILD → javatests/com/google/gerrit/server/BUILD
View File

@ -1,8 +1,6 @@
load("//tools/bzl:junit.bzl", "junit_tests")
TESTUTIL_DEPS = [
"//java/com/google/gerrit:module",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@ -10,6 +8,8 @@ TESTUTIL_DEPS = [
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/lucene",
@ -26,7 +26,7 @@ TESTUTIL_DEPS = [
]
CUSTOM_TRUTH_SUBJECTS = glob([
"server/**/*Subject.java",
"**/*Subject.java",
])
java_library(
@ -34,8 +34,8 @@ java_library(
testonly = 1,
srcs = CUSTOM_TRUTH_SUBJECTS,
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/truth",
"//lib:truth",
],
@ -55,9 +55,9 @@ java_library(
testonly = 1,
srcs = PROLOG_TEST_CASE,
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:junit",
@ -82,7 +82,7 @@ junit_tests(
)
QUERY_TESTS = glob(
["server/query/**/*.java"],
["query/**/*.java"],
)
java_library(
@ -115,7 +115,7 @@ junit_tests(
exclude = CUSTOM_TRUTH_SUBJECTS + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS,
),
resource_strip_prefix = "resources",
resources = ["//resources/com/google/gerrit:server"],
resources = ["//resources/com/google/gerrit/server"],
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":custom-truth-subjects",

2
javatests/com/google/gerrit/server/cache/h2/BUILD vendored
View File

@ -4,7 +4,7 @@ junit_tests(
name = "tests",
srcs = glob(["**/*.java"]),
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//lib:guava",
"//lib:h2",

4
javatests/com/google/gerrit/server/project/RefControlTest.java
View File

@ -43,8 +43,6 @@ import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.account.GroupMembership;
@ -60,6 +58,8 @@ import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.testing.Util;
import com.google.gerrit.server.rules.PrologEnvironment;
import com.google.gerrit.server.rules.RulesCache;
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;

2
javatests/com/google/gerrit/rules/GerritCommonTest.java → javatests/com/google/gerrit/server/rules/GerritCommonTest.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import static org.easymock.EasyMock.expect;

2
javatests/com/google/gerrit/rules/PrologTestCase.java → javatests/com/google/gerrit/server/rules/PrologTestCase.java
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.rules;
package com.google.gerrit.server.rules;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;

2
javatests/com/google/gerrit/sshd/BUILD
View File

@ -4,8 +4,8 @@ junit_tests(
name = "sshd_tests",
srcs = glob(["**/*.java"]),
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/sshd",
"//lib:truth",
"//lib/mina:sshd",

2
javatests/com/google/gerrit/testing/BUILD
View File

@ -5,7 +5,7 @@ junit_tests(
size = "small",
srcs = glob(["*.java"]),
deps = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:truth",
],

2
lib/asciidoctor/BUILD
View File

@ -31,7 +31,7 @@ java_library(
visibility = ["//visibility:public"],
deps = [
":asciidoc_lib",
"//java/com/google/gerrit:constants",
"//java/com/google/gerrit/server:constants",
"//lib:args4j",
"//lib:guava",
"//lib/lucene:lucene-analyzers-common",

4
plugins/BUILD
View File

@ -18,7 +18,7 @@ genrule2(
)
PLUGIN_API = [
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/server",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/sshd",
@ -96,7 +96,6 @@ java_binary(
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [
"//java/com/google/gerrit:libserver-src.jar",
"//java/com/google/gerrit/common:libannotations-src.jar",
"//java/com/google/gerrit/common:libserver-src.jar",
"//java/com/google/gerrit/extensions:libapi-src.jar",
@ -106,6 +105,7 @@ java_binary(
"//java/com/google/gerrit/index:libquery_parser-src.jar",
"//java/com/google/gerrit/pgm/init/api:libapi-src.jar",
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
"//java/com/google/gerrit/server:libserver-src.jar",
"//java/com/google/gerrit/sshd:libsshd-src.jar",
"//java/com/google/gwtexpui/server:libserver-src.jar",
],

2
prologtests/BUILD
View File

@ -1,5 +1,5 @@
filegroup(
name = "gerrit_common_test",
srcs = ["com/google/gerrit/rules/gerrit_common_test.pl"],
srcs = ["com/google/gerrit/server/rules/gerrit_common_test.pl"],
visibility = ["//visibility:public"],
)

0
prologtests/com/google/gerrit/rules/gerrit_common_test.pl → prologtests/com/google/gerrit/server/rules/gerrit_common_test.pl
View File

0
resources/com/google/gerrit/BUILD → resources/com/google/gerrit/server/BUILD
View File

2
tools/eclipse/BUILD
View File

@ -17,7 +17,7 @@ DEPS = [
"//gerrit-gwtui:ui_module",
"//gerrit-plugin-gwtui:gwtui-api-lib",
"//java/com/google/gerrit/acceptance:lib",
"//java/com/google/gerrit:server",
"//java/com/google/gerrit/server",
"//lib/asciidoctor:asciidoc_lib",
"//lib/asciidoctor:doc_indexer_lib",
"//lib/auto:auto-value",