diff --git a/src/main/java/org/takes/rq/RqHref.java b/src/main/java/org/takes/rq/RqHref.java
index f52b61321..4f2895fd9 100644
--- a/src/main/java/org/takes/rq/RqHref.java
+++ b/src/main/java/org/takes/rq/RqHref.java
@@ -27,8 +27,6 @@
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import lombok.EqualsAndHashCode;
import org.takes.HttpException;
import org.takes.Request;
@@ -63,15 +61,6 @@ public interface RqHref extends Request {
@EqualsAndHashCode(callSuper = true)
final class Base extends RqWrap implements RqHref {
- /**
- * HTTP Request-Line pattern.
- * @see RFC 2616
- */
- private static final Pattern REQUEST_PATTERN = Pattern.compile(
- "([!-~]+) ([^ ]+)( [^ ]+)?"
- );
-
/**
* Ctor.
* @param req Original request
@@ -80,28 +69,10 @@ public Base(final Request req) {
super(req);
}
- // @todo #445:30min/DEV RqMethod already validates Request-Line and
- // extracts HTTP Method from it. We should extract all important
- // information from Request-Line (HTTP method, URI and HTTP version)
- // in one place to enforce DRY principle.
@Override
public Href href() throws IOException {
- if (!this.head().iterator().hasNext()) {
- throw new HttpException(
- HttpURLConnection.HTTP_BAD_REQUEST,
- "HTTP Request should have Request-Line"
- );
- }
- final String line = this.head().iterator().next();
- final Matcher matcher =
- REQUEST_PATTERN.matcher(line);
- if (!matcher.matches()) {
- throw new HttpException(
- HttpURLConnection.HTTP_BAD_REQUEST,
- String.format("Illegal Request-Line: %s", line)
- );
- }
- final String uri = matcher.group(2);
+ final String uri = new RqRequestLine.Base(this)
+ .requestLineHeaderToken(RqRequestLine.URI);
return new Href(
String.format(
"http://%s%s",
diff --git a/src/main/java/org/takes/rq/RqMethod.java b/src/main/java/org/takes/rq/RqMethod.java
index 7818c4db4..96201fbbc 100644
--- a/src/main/java/org/takes/rq/RqMethod.java
+++ b/src/main/java/org/takes/rq/RqMethod.java
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.util.Locale;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import lombok.EqualsAndHashCode;
import org.takes.Request;
@@ -112,14 +111,6 @@ final class Base extends RqWrap implements RqMethod {
"[()<>@,;:\\\"/\\[\\]?={}]"
);
- /**
- * HTTP method line pattern.
- * [!-~] is for method or extension-method token (octets 33 - 126).
- */
- private static final Pattern PATTERN = Pattern.compile(
- "([!-~]+) [^ ]+( [^ ]+){0,1}"
- );
-
/**
* Ctor.
* @param req Original request
@@ -130,14 +121,8 @@ public Base(final Request req) {
@Override
public String method() throws IOException {
- final String line = this.head().iterator().next();
- final Matcher matcher = PATTERN.matcher(line);
- if (!matcher.matches()) {
- throw new IOException(
- String.format("Invalid HTTP method line: %s", line)
- );
- }
- final String method = matcher.group(1);
+ final String method = new RqRequestLine.Base(this)
+ .requestLineHeaderToken(RqRequestLine.METHOD);
if (SEPARATORS.matcher(method).find()) {
throw new IOException(
String.format("Invalid HTTP method: %s", method)
diff --git a/src/main/java/org/takes/rq/RqRequestLine.java b/src/main/java/org/takes/rq/RqRequestLine.java
new file mode 100644
index 000000000..ab9fe53de
--- /dev/null
+++ b/src/main/java/org/takes/rq/RqRequestLine.java
@@ -0,0 +1,161 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.takes.rq;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import lombok.EqualsAndHashCode;
+import org.takes.HttpException;
+import org.takes.Request;
+
+/**
+ * HTTP Request-Line parsing.
+ *
+ * All implementations of this interface must be immutable and thread-safe.
+ *
+ * @author Vladimir Maksimenko (xupypr@xupypr.com)
+ * @version $Id$
+ * @since 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+public interface RqRequestLine extends Request {
+
+ /**
+ * METHOD token.
+ */
+ int METHOD = 1;
+
+ /**
+ * URI token.
+ */
+ int URI = 2;
+
+ /**
+ * HTTPVERSION token.
+ */
+ int HTTPVERSION = 3;
+
+ /**
+ * Get Request-Line header.
+ * @return HTTP Request-Line header
+ * @throws IOException If fails
+ */
+ String requestLineHeader() throws IOException;
+
+ /**
+ * Get Request-Line header token by index number.
+ * @param index Token index number
+ * @return HTTP Request-Line header token specified by index number
+ * @throws IOException If fails
+ */
+ String requestLineHeaderToken(int index) throws IOException;
+
+ /**
+ * Request decorator for Request-Line header validation
+ *
+ *
The class is immutable and thread-safe.
+ * @author Vladimir Maksimenko (xupypr@xupypr.com)
+ * @version $Id$
+ * @since 1.0
+ */
+ @EqualsAndHashCode(callSuper = true)
+ final class Base extends RqWrap implements RqRequestLine {
+ /**
+ * HTTP Request-line pattern.
+ * [!-~] is for method or extension-method token (octets 33 - 126).
+ * @see RFC 2616
+ */
+ static final Pattern REQUEST_LINE_PATTERN = Pattern.compile(
+ "([!-~]+) ([^ ]+)( [^ ]+)?"
+ );
+
+ /**
+ * Ctor.
+ * @param req Original request
+ */
+ public Base(final Request req) {
+ super(req);
+ }
+
+ @Override
+ public String requestLineHeader() throws IOException {
+ return this.extractFromRequestLineHeader(null);
+ }
+
+ @Override
+ public String requestLineHeaderToken(final int index)
+ throws IOException {
+ // @checkstyle MagicNumberCheck (1 lines)
+ if (index < 1 || index > 3) {
+ throw new IllegalArgumentException(
+ String.format("Illegel indexNumber %d", index)
+ );
+ }
+ return this.extractFromRequestLineHeader(index);
+ }
+
+ /**
+ * Extract Request-Line or Request-Line token from Request.
+ *
+ * @param index Token index number
+ * @return Request-Line if index is null, token as string otherwise
+ * @throws IOException If fails
+ */
+ private String extractFromRequestLineHeader(final Integer index)
+ throws IOException {
+ if (!this.head().iterator().hasNext()) {
+ throw new HttpException(
+ HttpURLConnection.HTTP_BAD_REQUEST,
+ "HTTP Request should have Request-Line"
+ );
+ }
+ final String line = this.head().iterator().next();
+ final Matcher matcher = REQUEST_LINE_PATTERN.matcher(line);
+ if (!matcher.matches()) {
+ throw new HttpException(
+ HttpURLConnection.HTTP_BAD_REQUEST,
+ String.format(
+ "Invalid HTTP Request-Line header: %s",
+ line
+ )
+ );
+ }
+ if (index != null) {
+ final String token = matcher.group(index);
+ final String result;
+ if (token != null) {
+ result = token.trim();
+ } else {
+ result = token;
+ }
+ return result;
+ } else {
+ return line;
+ }
+ }
+ }
+}
diff --git a/src/test/java/org/takes/rq/RqRequestLineTest.java b/src/test/java/org/takes/rq/RqRequestLineTest.java
new file mode 100644
index 000000000..8a48a2a1e
--- /dev/null
+++ b/src/test/java/org/takes/rq/RqRequestLineTest.java
@@ -0,0 +1,256 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.takes.rq;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.takes.HttpException;
+
+/**
+ * Test case for {@link RqRequestLine.Base}.
+ * @author Vladimir Maksimenko (xupypr@xupypr.com)
+ * @version $Id$
+ * @since 1.0
+ */
+public final class RqRequestLineTest {
+
+ /**
+ * RqRequestLine.Base should throw {@link HttpException} when
+ * we call requestLineHeader with
+ * Request without Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = HttpException.class)
+ public void failsOnAbsentRequestLine() throws IOException {
+ new RqRequestLine.Base(
+ new RqSimple(Collections.emptyList(), null)
+ ).requestLineHeader();
+ }
+
+ /**
+ * RqRequestLine.Base should throw {@link HttpException} when
+ * we call requestLineHeader with
+ * Request with illegal Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = HttpException.class)
+ public void failsOnIllegalRequestLine() throws IOException {
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GIVE/contacts2",
+ "Host: 1.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeader();
+ }
+
+ /**
+ * RqRequestLine.Base can return Request-Line header
+ * we call requestLineHeader with valid Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test
+ public void extractsParams() throws IOException {
+ final String requestline = "GET /hello?a=6&b=7&c&d=9%28x%29&ff";
+ MatcherAssert.assertThat(
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ requestline,
+ "Host: a.example.com",
+ "Content-type: text/xml"
+ ),
+ ""
+ )
+ ).requestLineHeader(),
+ Matchers.equalToIgnoringCase(requestline)
+ );
+ }
+
+ /**
+ * RqRequestLine.Base should throw {@link HttpException} when
+ * we call requestLineHeaderToken with
+ * Request without Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = HttpException.class)
+ public void failsOnAbsentRequestLineToken() throws IOException {
+ new RqRequestLine.Base(
+ new RqSimple(Collections.emptyList(), null)
+ ).requestLineHeaderToken(1);
+ }
+
+ /**
+ * RqRequestLine.Base should throw {@link HttpException} when
+ * we call requestLineHeaderToken with
+ * Request with illegal Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = HttpException.class)
+ public void failsOnIllegalRequestLineToken() throws IOException {
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GIVE/contacts",
+ "Host: 3.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(1);
+ }
+
+ /**
+ * RqRequestLine.Base should throw {@link IllegalArgumentException} when
+ * we call requestLineHeaderToken with index number less then 1.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void failsOnIllegalRequestLineTokenIndexLessOne()
+ throws IOException {
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?a=4&b=7&c&d=9%28x%29&ff",
+ "Host: 4.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(0);
+ }
+
+ /**
+ * RqRequestLine.Base should throw {@link IllegalArgumentException} when
+ * we call requestLineHeaderToken with index number greater then 3.
+ * @throws IOException If some problem inside
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void failsOnIllegalRequestLineTokenIndexGreaterThree()
+ throws IOException {
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?a=5&b=7&c&d=9%28x%29&ff",
+ "Host: 5.example.com"
+ ),
+ ""
+ )
+ // @checkstyle MagicNumberCheck (1 lines)
+ ).requestLineHeaderToken(4);
+ }
+
+ /**
+ * RqRequestLine.Base can extract first token (METHOD)
+ * when we call requestLineHeaderToken
+ * with valid Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test
+ public void extractsFirstParam() throws IOException {
+ MatcherAssert.assertThat(
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?since=3431",
+ "Host: f1.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(RqRequestLine.METHOD),
+ Matchers.equalToIgnoringCase("GET")
+ );
+ }
+
+ /**
+ * RqRequestLine.Base can extract second token (URI)
+ * when we call requestLineHeaderToken
+ * with valid Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test
+ public void extractsSecondParam() throws IOException {
+ MatcherAssert.assertThat(
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?since=3432",
+ "Host: f2.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(RqRequestLine.URI),
+ Matchers.equalToIgnoringCase("/hello?since=3432")
+ );
+ }
+
+ /**
+ * RqRequestLine.Base can extract third token (HTTP VERSION)
+ * when we call requestLineHeaderToken
+ * with valid Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test
+ public void extractsThirdParam() throws IOException {
+ MatcherAssert.assertThat(
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?since=343 HTTP/1.1",
+ "Host: f3.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(RqRequestLine.HTTPVERSION),
+ Matchers.equalToIgnoringCase("HTTP/1.1")
+ );
+ }
+
+ /**
+ * RqRequestLine.Base can extract third token (HTTP VERSION)
+ * when we call requestLineHeaderToken
+ * even for Request-Line without HTTP VERSION
+ * with valid Request-Line.
+ * @throws IOException If some problem inside
+ */
+ @Test
+ public void extractsEmptyThirdParam() throws IOException {
+ MatcherAssert.assertThat(
+ new RqRequestLine.Base(
+ new RqFake(
+ Arrays.asList(
+ "GET /hello?since=3433",
+ "Host: f4.example.com"
+ ),
+ ""
+ )
+ ).requestLineHeaderToken(RqRequestLine.HTTPVERSION),
+ Matchers.equalTo(null)
+ );
+ }
+}