Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,7 @@ public Uni<Boolean> sendChallenge(RoutingContext context) {

var response = context.response();
response.setStatusCode(challengeData.status);

if (challengeData.headerName != null) {
response.headers().set(challengeData.headerName, challengeData.headerContent);
}

challengeData.getHeaders().forEach(response.headers()::set);
response.headers().set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);

try {
Expand Down Expand Up @@ -479,7 +475,7 @@ public PayloadChallengeData(int status, CharSequence headerName, String headerCo
}

public PayloadChallengeData(ChallengeData data, Object payload) {
super(data.status, data.headerName, data.headerContent);
super(data.status, data.getHeaders());
this.payload = payload;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,10 @@ public Optional<String> alias() {
public Optional<String> provider() {
return Optional.empty();
}

@Override
public Optional<List<Path>> certDirs() {
return Optional.empty();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.github.streamshub.console.api;

import java.io.IOException;
import java.io.StringReader;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand All @@ -11,7 +14,9 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.IntStream;
import java.util.stream.Stream;

import jakarta.inject.Inject;
import jakarta.json.Json;
Expand Down Expand Up @@ -46,8 +51,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvFileSource;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.skyscreamer.jsonassert.JSONAssert;
Expand Down Expand Up @@ -841,11 +847,23 @@ void testPatchConsumerGroupWithNoSuchGroup() {
}
}

static Stream<Arguments> testPatchConsumerGroupWithInvalidRequestCases() throws IOException {
try (var stream = GroupsResourceIT.class.getResourceAsStream("/patchConsumerGroup-invalid-requests.txt")) {
String text = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
return Arrays.stream(text.split("@"))
.filter(Predicate.not(String::isBlank))
.map(rec -> rec.split("\\|"))
.map(elements -> Arguments.of(
elements[0].strip(),
elements[1].strip(),
Status.valueOf(elements[2].strip()),
elements[3].strip()
));
}
}

@ParameterizedTest
@CsvFileSource(
delimiter = '|',
lineSeparator = "@\n",
resources = { "/patchConsumerGroup-invalid-requests.txt" })
@MethodSource("testPatchConsumerGroupWithInvalidRequestCases")
void testPatchConsumerGroupWithInvalidRequest(String label, String requestBody, Status responseStatus, String expectedResponse)
throws JSONException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.github.streamshub.console.api;

import java.io.IOException;
import java.io.StringReader;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -17,6 +20,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
Expand Down Expand Up @@ -75,8 +79,9 @@
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.aggregator.AggregateWith;
import org.junit.jupiter.params.provider.CsvFileSource;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.skyscreamer.jsonassert.JSONAssert;
Expand Down Expand Up @@ -2145,11 +2150,23 @@ void testPatchTopicWithValidateOnly() {
.body("data.attributes.configs.'retention.ms'.value", is("300000"));
}

static Stream<Arguments> testPatchTopicWithInvalidRequestCases() throws IOException {
try (var stream = TopicsResourceIT.class.getResourceAsStream("/patchTopic-invalid-requests.txt")) {
String text = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
return Arrays.stream(text.split("@"))
.filter(Predicate.not(String::isBlank))
.map(rec -> rec.split("\\|"))
.map(elements -> Arguments.of(
elements[0].strip(),
elements[1].strip(),
Status.valueOf(elements[2].strip()),
elements[3].strip()
));
}
}

@ParameterizedTest
@CsvFileSource(
delimiter = '|',
lineSeparator = "@\n",
resources = { "/patchTopic-invalid-requests.txt" })
@MethodSource("testPatchTopicWithInvalidRequestCases")
void testPatchTopicWithInvalidRequest(String label, String requestBody, Status responseStatus, String expectedResponse)
throws JSONException {

Expand Down
12 changes: 11 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<!-- Dependencies -->
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.27.3.1</quarkus.platform.version>
<quarkus.platform.version>3.33.1.1</quarkus.platform.version>
<strimzi-api.version>1.0.0</strimzi-api.version>
<strimzi-oauth.version>0.17.1</strimzi-oauth.version>
<apicurio-registry.version>3.2.4</apicurio-registry.version>
Expand Down Expand Up @@ -116,11 +116,21 @@
<artifactId>kiota-http-jdk</artifactId>
<version>${kiota-http-jdk.version}</version>
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-java-sdk</artifactId>
<version>${apicurio-registry.version}</version>
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-java-sdk-common</artifactId>
<version>${apicurio-registry.version}</version>
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-serde-common</artifactId>
<version>${apicurio-registry.version}</version>
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-registry-serde-kafka-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.ExecutableInvoker;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.MediaType;
import org.junit.jupiter.api.extension.TestInstances;
import org.junit.jupiter.api.function.ThrowingConsumer;
import org.junit.jupiter.api.parallel.ExecutionMode;
Expand Down Expand Up @@ -151,7 +150,7 @@ public Optional<String> getConfigurationParameter(String key) {
}

@Override
public <T> Optional<T> getConfigurationParameter(String key, Function<String, T> transformer) {
public <T> Optional<T> getConfigurationParameter(String key, Function<? super String, ? extends T> transformer) {
return delegate.getConfigurationParameter(key, transformer);
}

Expand All @@ -170,11 +169,6 @@ public void publishReportEntry(String value) {
delegate.publishReportEntry(value);
}

@Override
public void publishFile(String name, MediaType mediaType, ThrowingConsumer<Path> action) {
delegate.publishFile(name, mediaType, action);
}

@Override
public void publishDirectory(String name, ThrowingConsumer<Path> action) {
delegate.publishDirectory(name, action);
Expand All @@ -199,4 +193,9 @@ public ExecutionMode getExecutionMode() {
public ExecutableInvoker getExecutableInvoker() {
return delegate.getExecutableInvoker();
}

@Override
public void publishFile(String name, org.junit.jupiter.api.MediaType mediaType, ThrowingConsumer<Path> action) {
delegate.publishFile(name, mediaType, action);
}
}