From 32a3b1c706a59400bc08b5bd4bb056220c82f897 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 23 Aug 2017 00:53:24 +0200 Subject: [PATCH] Dissolve gerrit-elasticsearch top-level directory Change-Id: Iede5fe438d0166b3c1c805be15f83f6099ca31f1 --- gerrit-elasticsearch/BUILD | 70 ------------------- gerrit-pgm/BUILD | 4 +- gerrit-war/BUILD | 2 +- .../elasticsearch/AbstractElasticIndex.java | 0 java/com/google/gerrit/elasticsearch/BUILD | 29 ++++++++ .../elasticsearch/ElasticAccountIndex.java | 0 .../elasticsearch/ElasticChangeIndex.java | 0 .../elasticsearch/ElasticConfiguration.java | 0 .../elasticsearch/ElasticGroupIndex.java | 0 .../elasticsearch/ElasticIndexModule.java | 0 .../ElasticIndexVersionDiscovery.java | 0 .../gerrit/elasticsearch/ElasticMapping.java | 0 .../elasticsearch/ElasticProjectIndex.java | 0 .../elasticsearch/ElasticQueryBuilder.java | 0 .../elasticsearch/ElasticVersionManager.java | 0 .../elasticsearch/JestClientBuilder.java | 0 .../com/google/gerrit/elasticsearch/BUILD | 40 +++++++++++ .../ElasticQueryAccountsTest.java | 0 .../ElasticQueryChangesTest.java | 0 .../elasticsearch/ElasticQueryGroupsTest.java | 0 .../ElasticQueryProjectsTest.java | 0 .../elasticsearch/ElasticTestUtils.java | 0 22 files changed, 72 insertions(+), 73 deletions(-) delete mode 100644 gerrit-elasticsearch/BUILD rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/AbstractElasticIndex.java (100%) create mode 100644 java/com/google/gerrit/elasticsearch/BUILD rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticAccountIndex.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticChangeIndex.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticConfiguration.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticGroupIndex.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticIndexModule.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticMapping.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticProjectIndex.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/ElasticVersionManager.java (100%) rename {gerrit-elasticsearch/src/main/java => java}/com/google/gerrit/elasticsearch/JestClientBuilder.java (100%) create mode 100644 javatests/com/google/gerrit/elasticsearch/BUILD rename {gerrit-elasticsearch/src/test/java => javatests}/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java (100%) rename {gerrit-elasticsearch/src/test/java => javatests}/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java (100%) rename {gerrit-elasticsearch/src/test/java => javatests}/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java (100%) rename {gerrit-elasticsearch/src/test/java => javatests}/com/google/gerrit/elasticsearch/ElasticQueryProjectsTest.java (100%) rename {gerrit-elasticsearch/src/test/java => javatests}/com/google/gerrit/elasticsearch/ElasticTestUtils.java (100%) diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD deleted file mode 100644 index 0b9a0a1d9b..0000000000 --- a/gerrit-elasticsearch/BUILD +++ /dev/null @@ -1,70 +0,0 @@ -java_library( - name = "elasticsearch", - srcs = glob(["src/main/java/**/*.java"]), - visibility = ["//visibility:public"], - deps = [ - "//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/lifecycle", - "//java/com/google/gerrit/reviewdb:server", - "//lib:gson", - "//lib:guava", - "//lib:gwtorm", - "//lib:protobuf", - "//lib/commons:codec", - "//lib/commons:lang", - "//lib/elasticsearch", - "//lib/elasticsearch:jest", - "//lib/elasticsearch:jest-common", - "//lib/elasticsearch:joda-time", - "//lib/guice", - "//lib/guice:guice-assistedinject", - "//lib/jgit/org.eclipse.jgit:jgit", - "//lib/log:api", - "//lib/lucene:lucene-analyzers-common", - "//lib/lucene:lucene-core", - ], -) - -load("//tools/bzl:junit.bzl", "junit_tests") - -java_library( - name = "elasticsearch_test_utils", - testonly = 1, - srcs = glob(["src/test/java/**/ElasticTestUtils.java"]), - deps = [ - ":elasticsearch", - "//gerrit-server:server", - "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/index", - "//java/com/google/gerrit/reviewdb:server", - "//lib:gson", - "//lib:guava", - "//lib:junit", - "//lib:truth", - "//lib/elasticsearch", - "//lib/jgit/org.eclipse.jgit:jgit", - "//lib/jgit/org.eclipse.jgit.junit:junit", - ], -) - -junit_tests( - name = "elasticsearch_tests", - size = "large", - srcs = glob(["src/test/java/**/*Test.java"]), - tags = [ - "elastic", - ], - deps = [ - ":elasticsearch", - ":elasticsearch_test_utils", - "//gerrit-server:query_tests_code", - "//gerrit-server:server", - "//gerrit-server:testutil", - "//lib/guice", - "//lib/jgit/org.eclipse.jgit:jgit", - "//lib/jgit/org.eclipse.jgit.junit:junit", - ], -) diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index 164a815120..f1026c3f9f 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -52,9 +52,9 @@ java_library( deps = DEPS + [ ":init-api", ":util", + "//java/com/google/gerrit/elasticsearch", "//java/com/google/gerrit/index", "//java/com/google/gerrit/lucene", - "//gerrit-elasticsearch:elasticsearch", "//gerrit-launcher:launcher", # We want this dep to be provided_deps "//lib:args4j", "//lib:derby", @@ -116,9 +116,9 @@ REST_PGM_DEPS = [ ":init", ":init-api", ":util", + "//java/com/google/gerrit/elasticsearch", "//java/com/google/gerrit/gpg", "//java/com/google/gerrit/server/cache/h2", - "//gerrit-elasticsearch:elasticsearch", "//java/com/google/gerrit/index", "//java/com/google/gerrit/lucene", "//gerrit-oauth:oauth", diff --git a/gerrit-war/BUILD b/gerrit-war/BUILD index 478eac9007..3b948a548c 100644 --- a/gerrit-war/BUILD +++ b/gerrit-war/BUILD @@ -5,7 +5,6 @@ java_library( srcs = glob(["src/main/java/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//gerrit-elasticsearch:elasticsearch", "//gerrit-httpd:httpd", "//gerrit-oauth:oauth", "//gerrit-openid:openid", @@ -17,6 +16,7 @@ java_library( "//gerrit-server:receive", "//gerrit-server:server", "//gerrit-sshd:sshd", + "//java/com/google/gerrit/elasticsearch", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/gpg", "//java/com/google/gerrit/lifecycle", diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java rename to java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java diff --git a/java/com/google/gerrit/elasticsearch/BUILD b/java/com/google/gerrit/elasticsearch/BUILD new file mode 100644 index 0000000000..0ef4685c44 --- /dev/null +++ b/java/com/google/gerrit/elasticsearch/BUILD @@ -0,0 +1,29 @@ +java_library( + name = "elasticsearch", + srcs = glob(["**/*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//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/lifecycle", + "//java/com/google/gerrit/reviewdb:server", + "//lib:gson", + "//lib:guava", + "//lib:gwtorm", + "//lib:protobuf", + "//lib/commons:codec", + "//lib/commons:lang", + "//lib/elasticsearch", + "//lib/elasticsearch:jest", + "//lib/elasticsearch:jest-common", + "//lib/elasticsearch:joda-time", + "//lib/guice", + "//lib/guice:guice-assistedinject", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/log:api", + "//lib/lucene:lucene-analyzers-common", + "//lib/lucene:lucene-core", + ], +) diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java rename to java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java b/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java rename to java/com/google/gerrit/elasticsearch/ElasticChangeIndex.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java b/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticConfiguration.java rename to java/com/google/gerrit/elasticsearch/ElasticConfiguration.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java b/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java rename to java/com/google/gerrit/elasticsearch/ElasticGroupIndex.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java b/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexModule.java rename to java/com/google/gerrit/elasticsearch/ElasticIndexModule.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java b/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java rename to java/com/google/gerrit/elasticsearch/ElasticIndexVersionDiscovery.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java b/java/com/google/gerrit/elasticsearch/ElasticMapping.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java rename to java/com/google/gerrit/elasticsearch/ElasticMapping.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java b/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java rename to java/com/google/gerrit/elasticsearch/ElasticProjectIndex.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java b/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java rename to java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java b/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticVersionManager.java rename to java/com/google/gerrit/elasticsearch/ElasticVersionManager.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/JestClientBuilder.java b/java/com/google/gerrit/elasticsearch/JestClientBuilder.java similarity index 100% rename from gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/JestClientBuilder.java rename to java/com/google/gerrit/elasticsearch/JestClientBuilder.java diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD new file mode 100644 index 0000000000..3bb5a93c0d --- /dev/null +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -0,0 +1,40 @@ +load("//tools/bzl:junit.bzl", "junit_tests") + +java_library( + name = "elasticsearch_test_utils", + testonly = 1, + srcs = ["ElasticTestUtils.java"], + deps = [ + "//gerrit-server:server", + "//java/com/google/gerrit/elasticsearch", + "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/index", + "//java/com/google/gerrit/reviewdb:server", + "//lib:gson", + "//lib:guava", + "//lib:junit", + "//lib:truth", + "//lib/elasticsearch", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/jgit/org.eclipse.jgit.junit:junit", + ], +) + +junit_tests( + name = "elasticsearch_tests", + size = "large", + srcs = glob(["**/*Test.java"]), + tags = [ + "elastic", + ], + deps = [ + ":elasticsearch_test_utils", + "//gerrit-server:query_tests_code", + "//gerrit-server:server", + "//gerrit-server:testutil", + "//java/com/google/gerrit/elasticsearch", + "//lib/guice", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/jgit/org.eclipse.jgit.junit:junit", + ], +) diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java similarity index 100% rename from gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java rename to javatests/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java similarity index 100% rename from gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java rename to javatests/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java similarity index 100% rename from gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java rename to javatests/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticQueryProjectsTest.java similarity index 100% rename from gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryProjectsTest.java rename to javatests/com/google/gerrit/elasticsearch/ElasticQueryProjectsTest.java diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java b/javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java similarity index 100% rename from gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticTestUtils.java rename to javatests/com/google/gerrit/elasticsearch/ElasticTestUtils.java