Skip to content

Commit 9781895

Browse files
robobariorobobario
committed
chore: fix sonar warnings
Signed-off-by: Robert Young <robertyoungnz@gmail.com>
1 parent cb569d2 commit 9781895

6 files changed

Lines changed: 34 additions & 52 deletions

File tree

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/AbstractInstallKT.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import io.kroxylicious.test.ShellUtils;
1818

19+
import static org.assertj.core.api.Assertions.assertThat;
1920
import static org.assertj.core.api.Assumptions.assumeThat;
2021

2122
/**
@@ -39,10 +40,10 @@ static boolean testImageAvailable() {
3940
@Test
4041
void shouldInstallFromYamlManifests() {
4142
try {
42-
ShellUtils.execValidate(ALWAYS_VALID, ALWAYS_VALID, "kubectl", "apply", "-f", "target/packaged/install");
43+
assertThat(ShellUtils.execValidate(ALWAYS_VALID, ALWAYS_VALID, "kubectl", "apply", "-f", "target/packaged/install")).isTrue();
4344

44-
ShellUtils.execValidate(ALWAYS_VALID, ALWAYS_VALID, "kubectl", "wait", "-n", "kroxylicious-operator", "--for=jsonpath={.status.readyReplicas}=1",
45-
"--timeout=300s", "deployment", "kroxylicious-operator");
45+
assertThat(ShellUtils.execValidate(ALWAYS_VALID, ALWAYS_VALID, "kubectl", "wait", "-n", "kroxylicious-operator", "--for=jsonpath={.status.readyReplicas}=1",
46+
"--timeout=300s", "deployment", "kroxylicious-operator")).isTrue();
4647
LOGGER.info("Operator deployment became ready");
4748
}
4849
finally {

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/DeploymentReadyConditionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ class DeploymentReadyConditionTest {
3636
private AutoCloseable closeable;
3737

3838
@BeforeEach
39-
public void openMocks() {
39+
void openMocks() {
4040
closeable = MockitoAnnotations.openMocks(this);
4141
}
4242

4343
@AfterEach
44-
public void releaseMocks() throws Exception {
44+
void releaseMocks() throws Exception {
4545
closeable.close();
4646
}
4747

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/DerivedResourcesTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import java.time.Instant;
1616
import java.time.ZoneId;
1717
import java.util.ArrayList;
18-
import java.util.Arrays;
1918
import java.util.Comparator;
2019
import java.util.List;
2120
import java.util.Map;
@@ -29,7 +28,6 @@
2928
import org.junit.jupiter.api.DynamicTest;
3029
import org.junit.jupiter.api.TestFactory;
3130
import org.junitpioneer.jupiter.SetEnvironmentVariable;
32-
import org.mockito.stubbing.Answer;
3331

3432
import com.fasterxml.jackson.core.JsonProcessingException;
3533
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -309,11 +307,6 @@ private static Context<KafkaProxy> buildContext(Path testDir,
309307
List<KafkaService> kafkaServiceRefs,
310308
List<KafkaProxyIngress> ingresses)
311309
throws IOException {
312-
Answer<?> throwOnUnmockedInvocation = invocation -> {
313-
var stringifiedArgs = Arrays.stream(invocation.getArguments()).map(String::valueOf).collect(
314-
Collectors.joining(", "));
315-
throw new RuntimeException("Unmocked method: " + invocation.getMethod() + "(" + stringifiedArgs + ")");
316-
};
317310
Context<KafkaProxy> context = mock(Context.class);
318311

319312
var resourceContext = new DefaultManagedWorkflowAndDependentResourceContext(null, null, context);

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/KafkaProxyReconcilerIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void shouldIncludeReplicaCountInKafkaProxyStatus() {
209209

210210
// when
211211
var created = doCreate(kafkaService, kafkaProxy(PROXY_A, desiredReplicaCount));
212-
Deployment deployment = assertDeploymentReplicaCount(created.proxy(), desiredReplicaCount);
212+
assertDeploymentReplicaCount(created.proxy(), desiredReplicaCount);
213213

214214
// then
215215
assertStausReplicaCount(created.proxy(), desiredReplicaCount);
@@ -824,7 +824,7 @@ private void assertServiceTargetsProxyInstances(KafkaProxy proxy, VirtualKafkaCl
824824
.extracting(svc -> svc.getSpec().getSelector())
825825
.describedAs("Service's selector should select proxy pods")
826826
.isEqualTo(ProxyDeploymentDependentResource.podLabels(proxy));
827-
assertThat(service.getSpec().getPorts().size()).describedAs("number of ports").isEqualTo(4);
827+
assertThat(service.getSpec().getPorts()).describedAs("number of ports").hasSize(4);
828828
});
829829
}
830830

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/SecureConfigInterpolatorTest.java‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@
77
package io.kroxylicious.kubernetes.operator;
88

99
import java.util.Map;
10+
import java.util.stream.Stream;
1011

1112
import org.junit.jupiter.api.Test;
13+
import org.junit.jupiter.params.ParameterizedTest;
14+
import org.junit.jupiter.params.provider.Arguments;
15+
import org.junit.jupiter.params.provider.MethodSource;
1216

1317
import com.fasterxml.jackson.core.JsonProcessingException;
1418
import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
@@ -160,54 +164,38 @@ void shouldNotTnterpolateWhenQuoted() throws JsonProcessingException {
160164

161165
}
162166

163-
@Test
164-
void shouldThrowFromTnterpolateWhenPrefixed() throws JsonProcessingException {
165-
// given
166-
var i = new SecureConfigInterpolator("/base", Map.of("secret", MountedResourceConfigProvider.SECRET_PROVIDER));
167-
var jsonValue = YAML_MAPPER.readValue("""
167+
static Stream<Arguments> invalidInterpolations() {
168+
return Stream.of(Arguments.argumentSet("prefixed", """
168169
kms: AwsKms
169170
kmsConfig:
170171
prefixed:
171172
prefix ${secret:different-secret:a-key}
172-
""", Map.class);
173-
174-
// then
175-
assertThatThrownBy(() -> i.interpolate(jsonValue)).isInstanceOf(InterpolationException.class)
176-
.hasMessage("Config provider placeholders cannot be preceded or followed by other characters");
173+
""", "Config provider placeholders cannot be preceded or followed by other characters"),
174+
Arguments.argumentSet("suffixed", """
175+
kms: AwsKms
176+
kmsConfig:
177+
suffixed:
178+
${secret:different-secret:a-key} suffix
179+
""", "Config provider placeholders cannot be preceded or followed by other characters"),
180+
Arguments.argumentSet("unknown provider", """
181+
kms: AwsKms
182+
kmsConfig:
183+
knownProvider: ${secret:aws:a-key}
184+
unknownProvider: ${unknown:aws:a-key}
185+
""", "Unknown config provider 'unknown', known providers are: [secret]"));
177186
}
178187

179-
@Test
180-
void shouldThrowFromTnterpolateWhenSuffixed() throws JsonProcessingException {
188+
@MethodSource
189+
@ParameterizedTest
190+
void invalidInterpolations(String yamlConfig, String expectedExceptionMessage) throws JsonProcessingException {
181191
// given
182192
var i = new SecureConfigInterpolator("/base", Map.of("secret", MountedResourceConfigProvider.SECRET_PROVIDER));
183-
var jsonValue = YAML_MAPPER.readValue("""
184-
kms: AwsKms
185-
kmsConfig:
186-
suffixed:
187-
${secret:different-secret:a-key} suffix
188-
""", Map.class);
193+
var jsonValue = YAML_MAPPER.readValue(yamlConfig, Map.class);
189194

195+
// when
190196
// then
191197
assertThatThrownBy(() -> i.interpolate(jsonValue)).isInstanceOf(InterpolationException.class)
192-
.hasMessage("Config provider placeholders cannot be preceded or followed by other characters");
193-
}
194-
195-
@Test
196-
void shouldThrowFromInterpolateWhenUnknownProvider() throws JsonProcessingException {
197-
// given
198-
var i = new SecureConfigInterpolator("/base", Map.of("secret", MountedResourceConfigProvider.SECRET_PROVIDER));
199-
var jsonValue = YAML_MAPPER.readValue("""
200-
kms: AwsKms
201-
kmsConfig:
202-
knownProvider: ${secret:aws:a-key}
203-
unknownProvider: ${unknow:aws:a-key}
204-
""", Map.class);
205-
206-
// then
207-
assertThatThrownBy(() -> i.interpolate(jsonValue))
208-
.isInstanceOf(InterpolationException.class)
209-
.hasMessage("Unknown config provider 'unknow', known providers are: [secret]");
210-
198+
.hasMessage(expectedExceptionMessage);
211199
}
212200

213201
@Test

‎kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/TestFilesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void childFilesMatchingGlob(Set<String> filenames, String glob, Set<String> expe
8686
}
8787

8888
@Test
89-
void recursiveFilesForTestingEmpty(@TempDir Path tempDir) throws IOException {
89+
void recursiveFilesForTestingEmpty(@TempDir Path tempDir) {
9090
List<Path> paths = TestFiles.recursiveFilesInDirectory("*", tempDir);
9191
assertThat(paths).isEmpty();
9292
}

0 commit comments

Comments
 (0)