opendev/gerrit
Code Issues Proposed changes

Dissolve gerrit-util-http top-level directory

Browse Source 
Change-Id: Ib1a71b8e3c9787dc71f8e177cad499856195f543
This commit is contained in:
David Ostrovsky
2017-08-22 23:36:52 +02:00
committed by Dave Borowitz
parent 1f78f3efa1
commit a84150efe0
9 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-httpd/BUILD
View File

@@ -19,7 +19,6 @@ java_library(
"//gerrit-launcher:launcher", "//gerrit-launcher:launcher",
"//gerrit-server:receive", "//gerrit-server:receive",
"//gerrit-server:server", "//gerrit-server:server",
"//gerrit-util-http:http",
"//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server", "//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions:api",
@@ -29,6 +28,7 @@ java_library(
"//java/com/google/gerrit/prettify:server", "//java/com/google/gerrit/prettify:server",
"//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/util/cli", "//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/http",
"//java/com/google/gwtexpui/linker:server", "//java/com/google/gwtexpui/linker:server",
"//java/com/google/gwtexpui/server", "//java/com/google/gwtexpui/server",
"//java/org/eclipse/jgit:server", "//java/org/eclipse/jgit:server",
@@ -59,12 +59,12 @@ junit_tests(
deps = [ deps = [
":httpd", ":httpd",
"//gerrit-server:server", "//gerrit-server:server",
"//gerrit-util-http:http",
"//gerrit-util-http:testutil",
"//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server", "//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/util/http",
"//javatests/com/google/gerrit/util/http/testutil",
"//lib:gson", "//lib:gson",
"//lib:guava", "//lib:guava",
"//lib:gwtorm", "//lib:gwtorm",

40
gerrit-util-http/BUILD
View File

@@ -1,40 +0,0 @@
load("//tools/bzl:junit.bzl", "junit_tests")
java_library(
name = "http",
srcs = glob(["src/main/java/**/*.java"]),
visibility = ["//visibility:public"],
deps = ["//lib:servlet-api-3_1"],
)
TESTUTIL_SRCS = glob(["src/test/**/testutil/**/*.java"])
java_library(
name = "testutil",
testonly = 1,
srcs = TESTUTIL_SRCS,
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/extensions:api",
"//lib:guava",
"//lib:servlet-api-3_1",
"//lib/httpcomponents:httpclient",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)
junit_tests(
name = "http_tests",
srcs = glob(
["src/test/java/**/*.java"],
exclude = TESTUTIL_SRCS,
),
deps = [
":http",
":testutil",
"//lib:junit",
"//lib:servlet-api-3_1-without-neverlink",
"//lib:truth",
"//lib/easymock",
],
)

6
java/com/google/gerrit/util/http/BUILD Normal file
View File

@@ -0,0 +1,6 @@
java_library(
name = "http",
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = ["//lib:servlet-api-3_1"],
)

0
gerrit-util-http/src/main/java/com/google/gerrit/util/http/RequestUtil.java → java/com/google/gerrit/util/http/RequestUtil.java
View File

14
javatests/com/google/gerrit/util/http/BUILD Normal file
View File

@@ -0,0 +1,14 @@
load("//tools/bzl:junit.bzl", "junit_tests")
junit_tests(
name = "http_tests",
srcs = glob(["**/*.java"]),
deps = [
"//java/com/google/gerrit/util/http",
"//javatests/com/google/gerrit/util/http/testutil",
"//lib:junit",
"//lib:servlet-api-3_1-without-neverlink",
"//lib:truth",
"//lib/easymock",
],
)

0
gerrit-util-http/src/test/java/com/google/gerrit/util/http/RequestUtilTest.java → javatests/com/google/gerrit/util/http/RequestUtilTest.java
View File

13
javatests/com/google/gerrit/util/http/testutil/BUILD Normal file
View File

@@ -0,0 +1,13 @@
java_library(
name = "testutil",
testonly = 1,
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/extensions:api",
"//lib:guava",
"//lib:servlet-api-3_1",
"//lib/httpcomponents:httpclient",
"//lib/jgit/org.eclipse.jgit:jgit",
],
)

0
gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java → javatests/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java
View File

0
gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java → javatests/com/google/gerrit/util/http/testutil/FakeHttpServletResponse.java
View File