Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed May 30, 2018
2 parents eb7b638 + aa3d914 commit 31af9ea
Show file tree
Hide file tree
Showing 2 changed files with 229 additions and 0 deletions.
66 changes: 66 additions & 0 deletions src/main/java/org/cactoos/http/HtUpgradeWire.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2018 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.cactoos.http;

import java.io.IOException;
import org.cactoos.Input;

/**
* Wire that is capable of upgrading itself upon an 101 status code.
* @since 0.1
* @todo #23:30 min As discovered in #53, the upgrade is not a job of the
* wire because it need reading the contents of the response (in this case,
* status code). So, this feature would be under the responsibility of a
* response-like object. It must be implemented someway like this:
* new HtUpgradedResponse(
* new IterableOf<>(
* new MapEntry<Func<String, Boolean>, Func<URI, Wire>>(
* upgrade -> upgrade.contains("TLS"),
* HtSecureWire::new
* )
* )
* )
* The test HtUpgradeWireTest#testHtUpgrade must be removed after the
* implementation of this class.
*/
public final class HtUpgradeWire implements Wire {

/**
* Origin wire.
*/
private final Wire origin;

/**
* Ctor.
* @param origin Origin wire.
*/
public HtUpgradeWire(final Wire origin) {
this.origin = origin;
}

@Override
public Input send(final Input input) throws IOException {
return this.origin.send(input);
}
}
163 changes: 163 additions & 0 deletions src/test/java/org/cactoos/http/HtUpgradeWireTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2018 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.cactoos.http;

import java.io.IOException;
import java.io.InputStream;
import org.cactoos.Input;
import org.cactoos.Scalar;
import org.cactoos.text.TextOf;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.hamcrest.core.IsInstanceOf;
import org.junit.Ignore;
import org.junit.Test;
import org.takes.Request;
import org.takes.Response;
import org.takes.Take;
import org.takes.http.FtRemote;
import org.takes.rs.RsWithStatus;
import org.takes.tk.TkText;

/**
* Test for {@link HtUpgradeWire}. Must test if the {@link Wire} returned
* after an 101 status code is an {@link HtSecureWire}.
* @since 0.1
* @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
*/
public final class HtUpgradeWireTest {

/**
* Tests if the wire of the response of an 101 code is an
* {@link HtSecureWire}.
* @throws Exception If Something goes wrong.
*/
@Test
@Ignore("HtUpgradeWire implementation is not ready yet.")
public void testUpgrade() throws Exception {
new FtRemote(new TkAlways101Mock(new TkText("Hello, world!"))).exec(
home -> MatcherAssert.assertThat(
"Could not upgrade wire",
new ResponseWrap(
new HtUpgradeWire(
new HtWire(
home.getHost(), home.getPort()
)
),
home.getHost()
).value(),
new IsInstanceOf(HtSecureWire.class)
)
);
}

/**
* Test of {@link HtUpgradeWire} just to suit coverage standards.
* @throws Exception If something goes wrong.
*/
@Test
public void testHtUpgrade() throws Exception {
new FtRemote(new TkText("Upgraded wire")).exec(
home -> MatcherAssert.assertThat(
"Upgrade wire not found",
new TextOf(
new HtResponse(
new HtUpgradeWire(
new HtWire(
home.getHost(),
home.getPort()
)
),
home.getHost()
)
).asString(),
Matchers.containsString("HTTP/1.1 200")
)
);
}

/**
* Wrap for response which allows access to its wire.
*/
private class ResponseWrap implements Input, Scalar<Wire> {

/**
* Origin response.
*/
private final HtResponse response;
/**
* Original wire.
*/
private final Wire htwire;

/**
* Ctor.
* @param wire Original wire.
* @param req Request string.
*/
ResponseWrap(final Wire wire, final String req) {
this.htwire = wire;
this.response = new HtResponse(wire, req);
}

@Override
public InputStream stream() throws IOException {
return this.response.stream();
}

@Override
public Wire value() {
return this.htwire;
}
}

/**
* Mock which always returns response with 101 code.
*/
private class TkAlways101Mock implements Take {

/**
* Origin {@link Take}.
*/
private final Take origin;

/**
* Ctor.
* @param origin Origin take.
*/
TkAlways101Mock(final Take origin) {
this.origin = origin;
}

@Override
public Response act(final Request req) throws IOException {
return new RsWithStatus(
this.origin.act(req),
// @checkstyle MagicNumber (1 line)
101,
"Switching Protocols"
);
}
}
}

1 comment on commit 31af9ea

@0pdd
Copy link
Collaborator

@0pdd 0pdd commented on 31af9ea May 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 23-e7afac42 discovered in src/main/java/org/cactoos/http/HtUpgradeWire.java and submitted as #61. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.