Skip to content

Commit 8dc242c

Browse files
author
Alexey Semenyuk
committed
#39 Use cactoos FormattedText instead of static String format.
1 parent cc39ef7 commit 8dc242c

File tree

5 files changed

+41
-10
lines changed

5 files changed

+41
-10
lines changed

src/main/java/org/cactoos/http/HtResponse.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import java.net.URI;
3030
import org.cactoos.Input;
3131
import org.cactoos.io.InputOf;
32+
import org.cactoos.text.FormattedText;
33+
import org.cactoos.text.UncheckedText;
3234

3335
/**
3436
* Response.
@@ -66,12 +68,14 @@ public HtResponse(final String uri) {
6668
public HtResponse(final URI uri) {
6769
this(
6870
new HtWire(uri),
69-
String.format(
70-
"GET %s HTTP/1.1\r\nHost:%s",
71-
// @checkstyle AvoidInlineConditionalsCheck (1 line)
72-
uri.getQuery() == null ? "/" : uri.getQuery(),
73-
uri.getHost()
74-
)
71+
new UncheckedText(
72+
new FormattedText(
73+
"GET %s HTTP/1.1\r\nHost:%s",
74+
// @checkstyle AvoidInlineConditionalsCheck (1 line)
75+
uri.getQuery() == null ? "/" : uri.getQuery(),
76+
uri.getHost()
77+
)
78+
).asString()
7579
);
7680
}
7781

src/test/java/org/cactoos/http/HtAutoRedirectTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
package org.cactoos.http;
2525

2626
import org.cactoos.io.InputOf;
27+
import org.cactoos.text.FormattedText;
2728
import org.cactoos.text.JoinedText;
2829
import org.cactoos.text.TextOf;
30+
import org.cactoos.text.UncheckedText;
2931
import org.hamcrest.MatcherAssert;
3032
import org.hamcrest.Matchers;
3133
import org.junit.Test;
@@ -39,6 +41,7 @@
3941
* @version $Id$
4042
* @since 0.1
4143
* @checkstyle JavadocMethodCheck (500 lines)
44+
* @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
4245
*/
4346
public final class HtAutoRedirectTest {
4447

@@ -53,7 +56,11 @@ public void redirectsRequestAutomatically() throws Exception {
5356
new JoinedText(
5457
"\r\n",
5558
"HTTP/1.1 301",
56-
String.format("Location: %s", home)
59+
new UncheckedText(
60+
new FormattedText(
61+
"Location: %s", home
62+
)
63+
).asString()
5764
)
5865
)
5966
)

src/test/java/org/cactoos/http/HtResponseTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
package org.cactoos.http;
2525

2626
import java.io.IOException;
27+
import org.cactoos.text.FormattedText;
2728
import org.cactoos.text.JoinedText;
2829
import org.cactoos.text.TextOf;
30+
import org.cactoos.text.UncheckedText;
2931
import org.hamcrest.MatcherAssert;
3032
import org.hamcrest.Matchers;
3133
import org.junit.Test;
@@ -53,7 +55,11 @@ public void worksFine() throws IOException {
5355
new JoinedText(
5456
"\r\n",
5557
"GET / HTTP/1.1",
56-
String.format("Host:%s", home.getHost())
58+
new UncheckedText(
59+
new FormattedText(
60+
"Host:%s", home.getHost()
61+
)
62+
).asString()
5763
).asString()
5864
)
5965
).asString(),

src/test/java/org/cactoos/http/HtSecureWireTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
import javax.net.ssl.SSLServerSocketFactory;
3030
import org.cactoos.Input;
3131
import org.cactoos.io.InputOf;
32+
import org.cactoos.text.FormattedText;
3233
import org.cactoos.text.JoinedText;
3334
import org.cactoos.text.TextOf;
35+
import org.cactoos.text.UncheckedText;
3436
import org.hamcrest.MatcherAssert;
3537
import org.hamcrest.Matchers;
3638
import org.junit.Test;
@@ -132,7 +134,12 @@ public InputStream stream() throws IOException {
132134
new JoinedText(
133135
delimiter,
134136
"GET / HTTP/1.1",
135-
String.format("Host: %s", this.host),
137+
new UncheckedText(
138+
new FormattedText(
139+
"Host: %s",
140+
this.host
141+
)
142+
).asString(),
136143
"Connection: close",
137144
delimiter
138145
)

src/test/java/org/cactoos/http/HtWireTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
import org.cactoos.BiFunc;
3030
import org.cactoos.io.DeadInput;
3131
import org.cactoos.io.DeadInputStream;
32+
import org.cactoos.text.FormattedText;
3233
import org.cactoos.text.JoinedText;
3334
import org.cactoos.text.TextOf;
35+
import org.cactoos.text.UncheckedText;
3436
import org.hamcrest.MatcherAssert;
3537
import org.hamcrest.Matchers;
3638
import org.junit.Test;
@@ -78,7 +80,12 @@ public void worksWithProvidedHostNameAndPort() throws IOException {
7880
new JoinedText(
7981
"\r\n",
8082
"GET / HTTP/1.1",
81-
String.format("Host:%s", home.getHost())
83+
new UncheckedText(
84+
new FormattedText(
85+
"Host:%s",
86+
home.getHost()
87+
)
88+
).asString()
8289
).asString()
8390
)
8491
).asString(),

0 commit comments

Comments
 (0)