Dissolve gerrit-index top-level directory

Change-Id: Id480f7a9408389ef0af05cce567148799f66fc19

gerrit-acceptance-framework/BUILD

@@ -12,8 +12,8 @@ PROVIDED = [
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/index",
     "//gerrit-httpd:httpd",
-    "//gerrit-index:index",
     "//gerrit-lucene:lucene",
     "//gerrit-pgm:init",
     "//java/com/google/gerrit/reviewdb:server",
@@ -41,13 +41,13 @@ java_library2(
     srcs = SRCS,
     exported_deps = [
         "//gerrit-gpg:gpg",
-        "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
         "//gerrit-openid:openid",
         "//gerrit-pgm:daemon",
         "//gerrit-pgm:http-jetty",
         "//gerrit-pgm:util-nodep",
         "//gerrit-server:testutil",
+        "//java/com/google/gerrit/index:query_exception",
         "//lib:jimfs",
         "//lib:truth",
         "//lib:truth-java8-extension",

gerrit-elasticsearch/BUILD

@@ -3,10 +3,10 @@ java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-index:index",
-        "//gerrit-index:query_exception",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",
@@ -35,9 +35,9 @@ java_library(
     srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
     deps = [
         ":elasticsearch",
-        "//gerrit-index:index",
         "//gerrit-server:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gson",
         "//lib:guava",

gerrit-httpd/BUILD

@@ -16,7 +16,6 @@ java_library(
     resources = RESOURCES,
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
@@ -25,6 +24,7 @@ java_library(
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",

gerrit-lucene/BUILD

@@ -7,9 +7,9 @@ java_library(
     srcs = QUERY_BUILDER,
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-index:index",
-        "//gerrit-index:query_exception",
         "//gerrit-server:server",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib:gwtorm",
@@ -26,12 +26,12 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":query_builder",
-        "//gerrit-index:index",
-        "//gerrit-index:query_exception",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-pgm/BUILD

@@ -50,7 +50,7 @@ java_library(
     deps = DEPS + [
         ":init-api",
         ":util",
-        "//gerrit-index:index",
+        "//java/com/google/gerrit/index",
         "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-launcher:launcher",  # We want this dep to be provided_deps
         "//gerrit-lucene:lucene",
@@ -117,7 +117,7 @@ REST_PGM_DEPS = [
     "//gerrit-cache-h2:cache-h2",
     "//gerrit-elasticsearch:elasticsearch",
     "//gerrit-gpg:gpg",
-    "//gerrit-index:index",
+    "//java/com/google/gerrit/index",
     "//gerrit-lucene:lucene",
     "//gerrit-oauth:oauth",
     "//gerrit-openid:openid",

gerrit-plugin-api/BUILD

@@ -6,12 +6,12 @@ PLUGIN_API = [
 ]
 
 EXPORTS = [
-    "//gerrit-index:index",
-    "//gerrit-index:query_exception",
-    "//gerrit-index:query_parser",
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/index",
+    "//java/com/google/gerrit/index:query_exception",
+    "//java/com/google/gerrit/index:query_parser",
     "//java/com/google/gwtexpui/server",
     "//gerrit-server:metrics",
     "//java/com/google/gerrit/reviewdb:server",
@@ -76,14 +76,15 @@ java_binary(
     visibility = ["//visibility:public"],
     runtime_deps = [
         "//gerrit-httpd:libhttpd-src.jar",
-        "//gerrit-index:libquery_exception-src.jar",
-        "//gerrit-index:libquery_parser-src.jar",
         "//gerrit-pgm:libinit-api-src.jar",
         "//gerrit-server:libserver-src.jar",
         "//gerrit-sshd:libsshd-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",
+        "//java/com/google/gerrit/index:libindex-src.jar",
+        "//java/com/google/gerrit/index:libquery_exception-src.jar",
+        "//java/com/google/gerrit/index:libquery_parser-src.jar",
         "//java/com/google/gerrit/reviewdb:libserver-src.jar",
         "//java/com/google/gwtexpui/server:libserver-src.jar",
     ],
@@ -94,8 +95,9 @@ load("//tools/bzl:javadoc.bzl", "java_doc")
 java_doc(
     name = "plugin-api-javadoc",
     libs = PLUGIN_API + [
-        "//gerrit-index:query_exception",
-        "//gerrit-index:query_parser",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/index:query_parser",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",

gerrit-server/BUILD

@@ -40,11 +40,11 @@ java_library(
     deps = [
         ":constants",
         ":metrics",
-        "//gerrit-index:index",
-        "//gerrit-index:query_exception",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",
@@ -160,7 +160,7 @@ TESTUTIL_DEPS = [
     "//gerrit-cache-h2:cache-h2",
     "//java/com/google/gerrit/extensions:api",
     "//gerrit-gpg:gpg",
-    "//gerrit-index:index",
+    "//java/com/google/gerrit/index",
     "//gerrit-lucene:lucene",
     "//java/com/google/gerrit/reviewdb:server",
     "//lib:gwtorm",
@@ -297,7 +297,7 @@ junit_tests(
     deps = TESTUTIL_DEPS + [
         ":custom-truth-subjects",
         ":testutil",
-        "//gerrit-index:query_exception",
+        "//java/com/google/gerrit/index:query_exception",
         "//java/org/eclipse/jgit:server",
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//lib:args4j",

java/com/google/gerrit/index/BUILD

@@ -1,9 +1,8 @@
 load("//tools/bzl:genrule2.bzl", "genrule2")
-load("//tools/bzl:junit.bzl", "junit_tests")
 
 QUERY_PARSE_EXCEPTION_SRCS = [
-    "src/main/java/com/google/gerrit/index/query/QueryParseException.java",
-    "src/main/java/com/google/gerrit/index/query/QueryRequiresAuthException.java",
+    "query/QueryParseException.java",
+    "query/QueryRequiresAuthException.java",
 ]
 
 java_library(
@@ -15,7 +14,10 @@ java_library(
 java_library(
     name = "query_parser",
     srcs = ["//antlr3:query"],
-    visibility = ["//gerrit-plugin-api:__pkg__"],
+    visibility = [
+        "//gerrit-plugin-api:__pkg__",
+        "//javatests/com/google/gerrit/index:__pkg__",
+    ],
     deps = [
         ":query_exception",
         "//lib/antlr:java_runtime",
@@ -25,7 +27,7 @@ java_library(
 java_library(
     name = "index",
     srcs = glob(
-        ["src/main/java/**/*.java"],
+        ["**/*.java"],
         exclude = QUERY_PARSE_EXCEPTION_SRCS,
     ),
     visibility = ["//visibility:public"],
@@ -44,19 +46,3 @@ java_library(
         "//lib/log:api",
     ],
 )
-
-junit_tests(
-    name = "index_tests",
-    size = "small",
-    srcs = glob(["src/test/java/**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":index",
-        ":query_exception",
-        ":query_parser",
-        "//lib:junit",
-        "//lib:truth",
-        "//lib/antlr:java_runtime",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-    ],
-)

javatests/com/google/gerrit/index/BUILD

@@ -0,0 +1,17 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+    name = "tests",
+    size = "small",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/index:query_parser",
+        "//lib:junit",
+        "//lib:truth",
+        "//lib/antlr:java_runtime",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)

lib/antlr/BUILD

@@ -1,4 +1,4 @@
-package(default_visibility = ["//gerrit-index:__pkg__"])
+package(default_visibility = ["//java/com/google/gerrit/index:__pkg__"])
 
 [java_library(
     name = n,

tools/eclipse/BUILD

@@ -11,7 +11,6 @@ TEST_DEPS = [
     "//gerrit-gpg:gpg_tests",
     "//gerrit-gwtui:ui_tests",
     "//gerrit-httpd:httpd_tests",
-    "//gerrit-index:index_tests",
     "//gerrit-server:server_tests",
 ]