Skip to content

REST API add support for /<module>/v1/hook paths #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solsson merged 2 commits into from
Dec 14, 2020
Merged

REST API add support for /<module>/v1/hook paths #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17ef05d
Adds a test for new paths we need to support
solsson Dec 13, 2020
ecc619a
Adds support for routing to hook as part of an api group
solsson Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions rest/src/main/java/se/yolean/kafka/hook/rest/KafkaHookRestResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,35 @@
import se.yolean.kafka.hook.http.KafkaHookResource;

@Produces(MediaType.APPLICATION_JSON)
@Path("/hook/v1")
@Path("/")
public class KafkaHookRestResource {

@Inject KafkaHookResource hook;

@POST
public Response produce(@Context HttpHeaders headers, @Context UriInfo uri, InputStream payload) throws IOException {
@Path("hook/v1")
public Response produce(@Context HttpHeaders headers, @Context UriInfo uri, InputStream payload)
throws IOException {
return hook.produce(headers, uri, "", payload);
}

@POST
@Path("/{type}")
@Path("hook/v1/{type:.*}")
public Response produce(@Context HttpHeaders headers, @Context UriInfo uri, @PathParam("type") String type, InputStream payload)
// if we fail to read the payload, which would be very strange
throws IOException {
return hook.produce(headers, uri, type, payload);
}

@POST
@Path("{prefix}/v1/hook")
public Response produceAltPathWithoutType(@Context HttpHeaders headers, @Context UriInfo uri, InputStream payload)
throws IOException {
return hook.produce(headers, uri, "", payload);
}

@POST
@Path("{prefix}/v1/hook/{type:.*}")
public Response produceAltPath(@Context HttpHeaders headers, @Context UriInfo uri, @PathParam("type") String type, InputStream payload)
throws IOException {
return hook.produce(headers, uri, type, payload);
}
Expand Down
39 changes: 39 additions & 0 deletions rest/src/test/java/se/yolean/kafka/hook/rest/KafkaHookResourceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;

import java.io.UnsupportedEncodingException;
import java.time.Duration;
Expand Down Expand Up @@ -160,6 +161,44 @@ public void testProduceString() throws UnsupportedEncodingException {
assertEquals("github.com/Yolean/kafka-hook/mytype", headers(record2).get("ce_type"));
}

@Test
public void testProduceAlternativeUrls() throws UnsupportedEncodingException {
given()
.contentType(ContentType.TEXT)
.accept(ContentType.JSON)
.body("test1".getBytes())
.when().post("/hook/v1/mytype/with/slashes")
.then()
.body(containsString("\"offset\":" + (startOffset)))
.statusCode(200);
given()
.contentType(ContentType.TEXT)
.accept(ContentType.JSON)
.body("test2".getBytes())
.when().post("/some-prefix/v1/hook")
.then()
.body(containsString("\"offset\":" + (startOffset + 1)))
.statusCode(200);
given()
.contentType(ContentType.TEXT)
.accept(ContentType.JSON)
.body("test3".getBytes())
.when().post("/some-prefix/v1/hook/sub/type/")
.then()
.body(containsString("\"offset\":" + (startOffset + 2)))
.statusCode(200);
waitBetweenPolls();
ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(1000));
Iterator<ConsumerRecord<String, String>> it = records.iterator();
ConsumerRecord<String, String> record1 = it.next();
assertEquals("github.com/Yolean/kafka-hook/mytype/with/slashes", headers(record1).get("ce_type"));
ConsumerRecord<String, String> record2 = it.next();
assertEquals("github.com/Yolean/kafka-hook/", headers(record2).get("ce_type"));
ConsumerRecord<String, String> record3 = it.next();
assertNotEquals("github.com/Yolean/kafka-hook/sub/type/", headers(record3).get("ce_type"));
assertEquals("github.com/Yolean/kafka-hook/sub/type", headers(record3).get("ce_type"));
}

@Test
public void testCloudeventsDistributedTracingExtensionWithEnvoyHeaders() {
given()
Expand Down