SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement remainder of Spring Boot Checkstyle code rules

Browse Source 
Fixes #532

Implements most of the remaining rules from Spring Boot, except JavaDoc + a few additional ones
This commit is contained in:
Marius Bogoevici
2016-05-12 15:55:03 -04:00
parent bbe5b3ee56
commit 18dc0a707d
97 changed files with 546 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/kafka/KafkaTestSupport.java
View File

@@ -66,7 +66,7 @@ public class KafkaTestSupport extends AbstractExternalResourceTestSupport<String
private final Properties brokerConfig = TestUtils.createBrokerConfig(0, TestUtils.choosePort(), false);
// caches previous failures to reach the external server - preventing repeated retries
private static boolean hasFailedAlready = false;
private static boolean hasFailedAlready;
static {
// check if either the environment or Java property is set to use embedded tests
@@ -122,7 +122,8 @@ public class KafkaTestSupport extends AbstractExternalResourceTestSupport<String
try {
int zkConnectionTimeout = 10000;
int zkSessionTimeout = 10000;
zkClient = new ZkClient(getZkConnectString(), zkSessionTimeout, zkConnectionTimeout, ZKStringSerializer$.MODULE$);
zkClient = new ZkClient(getZkConnectString(), zkSessionTimeout, zkConnectionTimeout,
ZKStringSerializer$.MODULE$);
}
catch (Exception e) {
zookeeper.shutdown();
@@ -134,15 +135,18 @@ public class KafkaTestSupport extends AbstractExternalResourceTestSupport<String
brokerConfig.put("zookeeper.connect", zookeeper.getConnectString());
brokerConfig.put("auto.create.topics.enable", "false");
brokerConfig.put("delete.topic.enable", "true");
kafkaServer = TestUtils.createServer(new KafkaConfig(brokerConfigProperties), SystemTime$.MODULE$);
log.debug("Created Kafka server at " + kafkaServer.config().hostName() + ":" + kafkaServer.config().port());
kafkaServer = TestUtils.createServer(new KafkaConfig(brokerConfigProperties),
SystemTime$.MODULE$);
log.debug("Created Kafka server at " + kafkaServer.config().hostName() + ":"
+ kafkaServer.config().port());
}
catch (Exception e) {
zookeeper.shutdown();
zkClient.close();
throw e;
}
} catch (Exception e) {
}
catch (Exception e) {
hasFailedAlready = true;
throw e;
}
@@ -154,7 +158,8 @@ public class KafkaTestSupport extends AbstractExternalResourceTestSupport<String
throw new RuntimeException("Kafka server not available");
}
}
} else {
}
else {
throw new RuntimeException("Kafka server not available");
}
}