Refactor RequestUtil into a separate package

Move RequestUtil into its own package. This facilitates
reuse of request attribute accessor methods by external
libraries.

Change-Id: Id002eb4f72827d65087a999adbd2ba9a58795fe2
This commit is contained in:
David Pletcher 2014-10-28 21:57:32 -07:00 committed by Dave Borowitz
parent e78f3bb48a
commit 015ce0a2f2
6 changed files with 26 additions and 4 deletions

View File

@ -18,6 +18,7 @@ java_library(
'//gerrit-reviewdb:server',
'//gerrit-server:server',
'//gerrit-util-cli:cli',
'//gerrit-util-http:http',
'//lib:args4j',
'//lib:gson',
'//lib:guava',
@ -53,6 +54,7 @@ java_test(
'//gerrit-extension-api:api',
'//gerrit-reviewdb:server',
'//gerrit-server:server',
'//gerrit-util-http:http',
'//lib:junit',
'//lib:gson',
'//lib:gwtorm',

View File

@ -26,7 +26,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import com.google.gerrit.extensions.registration.RegistrationHandle;
import com.google.gerrit.httpd.RequestUtil;
import com.google.gerrit.httpd.resources.Resource;
import com.google.gerrit.httpd.resources.ResourceKey;
import com.google.gerrit.httpd.resources.SmallResource;
@ -42,6 +41,7 @@ import com.google.gerrit.server.plugins.PluginsCollection;
import com.google.gerrit.server.plugins.ReloadPluginListener;
import com.google.gerrit.server.plugins.StartPluginListener;
import com.google.gerrit.server.ssh.SshInfo;
import com.google.gerrit.util.http.RequestUtil;
import com.google.gwtexpui.server.CacheHeaders;
import com.google.inject.Inject;
import com.google.inject.Provider;

View File

@ -74,7 +74,6 @@ import com.google.gerrit.extensions.restapi.RestResource;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.httpd.RequestUtil;
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.AccessPath;
import com.google.gerrit.server.AnonymousUser;
@ -82,6 +81,7 @@ import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.OptionUtil;
import com.google.gerrit.server.OutputFormat;
import com.google.gerrit.server.account.CapabilityUtils;
import com.google.gerrit.util.http.RequestUtil;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.FieldNamingPolicy;

20
gerrit-util-http/BUCK Normal file
View File

@ -0,0 +1,20 @@
java_library(
name = 'http',
srcs = glob(['src/main/java/**/*.java']),
provided_deps = ['//lib:servlet-api-3_1'],
visibility = ['PUBLIC'],
)
java_test(
name = 'http_tests',
srcs = glob(['src/test/java/**/*.java']),
deps = [
':http',
'//lib:junit',
'//lib:servlet-api-3_1',
'//lib/easymock:easymock',
],
source_under_test = [':http'],
# TODO(sop) Remove after Buck supports Eclipse
visibility = ['//tools/eclipse:classpath'],
)

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.httpd;
package com.google.gerrit.util.http;
import javax.servlet.http.HttpServletRequest;

View File

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