Skip to content

Commit a080919

Browse files
committed
Fix Sonar issues
1 parent 12c3b95 commit a080919

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

spring-kafka-test/src/main/java/org/springframework/kafka/test/condition/EmbeddedKafkaCondition.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,7 @@ private boolean springTestContext(AnnotatedElement annotatedElement) {
115115
@SuppressWarnings("unchecked")
116116
private EmbeddedKafkaBroker createBroker(EmbeddedKafka embedded) {
117117
EmbeddedKafkaBroker broker;
118-
int[] ports = embedded.ports();
119-
if (embedded.count() > 1 && ports.length == 1 && ports[0] == 0) {
120-
ports = new int[embedded.count()];
121-
}
118+
int[] ports = setupPorts(embedded);
122119
broker = new EmbeddedKafkaBroker(embedded.count(), embedded.controlledShutdown(), embedded.topics())
123120
.zkPort(embedded.zookeeperPort())
124121
.kafkaPorts(ports);
@@ -162,6 +159,14 @@ private EmbeddedKafkaBroker createBroker(EmbeddedKafka embedded) {
162159
return broker;
163160
}
164161

162+
private int[] setupPorts(EmbeddedKafka embedded) {
163+
int[] ports = embedded.ports();
164+
if (embedded.count() > 1 && ports.length == 1 && ports[0] == 0) {
165+
ports = new int[embedded.count()];
166+
}
167+
return ports;
168+
}
169+
165170
private EmbeddedKafkaBroker getBrokerFromStore(ExtensionContext context) {
166171
return getParentStore(context).get(EMBEDDED_BROKER, EmbeddedKafkaBroker.class) == null
167172
? getStore(context).get(EMBEDDED_BROKER, EmbeddedKafkaBroker.class)

spring-kafka-test/src/main/java/org/springframework/kafka/test/context/EmbeddedKafkaContextCustomizer.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
6666
.map(environment::resolvePlaceholders)
6767
.toArray(String[]::new);
6868

69-
int[] ports = this.embeddedKafka.ports();
70-
if (this.embeddedKafka.count() > 1 && ports.length == 1 && ports[0] == 0) {
71-
ports = new int[this.embeddedKafka.count()];
72-
}
69+
int[] ports = setupPorts();
7370
EmbeddedKafkaBroker embeddedKafkaBroker = new EmbeddedKafkaBroker(this.embeddedKafka.count(),
7471
this.embeddedKafka.controlledShutdown(),
7572
this.embeddedKafka.partitions(),
@@ -118,6 +115,14 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
118115
((DefaultSingletonBeanRegistry) beanFactory).registerDisposableBean(EmbeddedKafkaBroker.BEAN_NAME, embeddedKafkaBroker);
119116
}
120117

118+
private int[] setupPorts() {
119+
int[] ports = this.embeddedKafka.ports();
120+
if (this.embeddedKafka.count() > 1 && ports.length == 1 && ports[0] == 0) {
121+
ports = new int[this.embeddedKafka.count()];
122+
}
123+
return ports;
124+
}
125+
121126
@Override
122127
public int hashCode() {
123128
return this.embeddedKafka.hashCode();

0 commit comments

Comments
 (0)