From ec566380ffff02c36f8e1340285279a63d60bc3f Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 12 Jun 2018 11:04:03 -0400 Subject: [PATCH] Move UserAgentRule to httpd.raw and delete gwtexpui.linker.server This class is only used in one place, so move it there. After this commit, there is no more server-related code in gwtexpui, so it should be safe to delete those directories wholesale when the GWT UI is removed. Change-Id: Ia236f9fc516ec65c46663e34fe89ddb330ef0931 --- java/com/google/gerrit/httpd/BUILD | 1 - .../com/google/gerrit/httpd/raw/RecompileGwtUiFilter.java | 1 - .../linker/server => gerrit/httpd/raw}/UserAgentRule.java | 8 ++++---- java/com/google/gerrit/pgm/BUILD | 1 - java/com/google/gwtexpui/linker/BUILD | 6 ------ 5 files changed, 4 insertions(+), 13 deletions(-) rename java/com/google/{gwtexpui/linker/server => gerrit/httpd/raw}/UserAgentRule.java (94%) delete mode 100644 java/com/google/gwtexpui/linker/BUILD diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD index bb1393e61b..bbb5b660e2 100644 --- a/java/com/google/gerrit/httpd/BUILD +++ b/java/com/google/gerrit/httpd/BUILD @@ -18,7 +18,6 @@ java_library( "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/util/cli", "//java/com/google/gerrit/util/http", - "//java/com/google/gwtexpui/linker:server", "//java/org/eclipse/jgit:server", "//lib:args4j", "//lib:gson", diff --git a/java/com/google/gerrit/httpd/raw/RecompileGwtUiFilter.java b/java/com/google/gerrit/httpd/raw/RecompileGwtUiFilter.java index 90aedbe453..c6c336707b 100644 --- a/java/com/google/gerrit/httpd/raw/RecompileGwtUiFilter.java +++ b/java/com/google/gerrit/httpd/raw/RecompileGwtUiFilter.java @@ -14,7 +14,6 @@ package com.google.gerrit.httpd.raw; -import com.google.gwtexpui.linker.server.UserAgentRule; import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/java/com/google/gwtexpui/linker/server/UserAgentRule.java b/java/com/google/gerrit/httpd/raw/UserAgentRule.java similarity index 94% rename from java/com/google/gwtexpui/linker/server/UserAgentRule.java rename to java/com/google/gerrit/httpd/raw/UserAgentRule.java index 8f7bedeb00..4aac243875 100644 --- a/java/com/google/gwtexpui/linker/server/UserAgentRule.java +++ b/java/com/google/gerrit/httpd/raw/UserAgentRule.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gwtexpui.linker.server; +package com.google.gerrit.httpd.raw; import static java.util.regex.Pattern.compile; @@ -28,15 +28,15 @@ import javax.servlet.http.HttpServletRequest; * *

Ported from JavaScript in {@code com.google.gwt.user.UserAgent.gwt.xml}. */ -public class UserAgentRule { +class UserAgentRule { private static final Pattern msie = compile(".*msie ([0-11]+)\\.([0-11]+).*"); private static final Pattern gecko = compile(".*rv:([0-9]+)\\.([0-9]+).*"); - public String getName() { + String getName() { return "user.agent"; } - public String select(HttpServletRequest req) { + String select(HttpServletRequest req) { String ua = req.getHeader("User-Agent"); if (ua == null) { return null; diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index 57d3ff4702..95570ec6ac 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD @@ -43,7 +43,6 @@ java_library( "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/sshd", "//java/com/google/gerrit/util/http", - "//java/com/google/gwtexpui/linker:server", "//lib:args4j", "//lib:guava", "//lib:gwtorm", diff --git a/java/com/google/gwtexpui/linker/BUILD b/java/com/google/gwtexpui/linker/BUILD deleted file mode 100644 index 5c5c60090d..0000000000 --- a/java/com/google/gwtexpui/linker/BUILD +++ /dev/null @@ -1,6 +0,0 @@ -java_library( - name = "server", - srcs = glob(["server/*.java"]), - visibility = ["//visibility:public"], - deps = ["//lib:servlet-api-3_1"], -)