Polishing for StreamsBuilderFactoryBean

Author: artembilan

spring-kafka/src/main/java/org/springframework/kafka/core/CleanupConfig.java

@@ -26,6 +26,7 @@
 public class CleanupConfig {
 
 	private final boolean onStart;
+
 	private final boolean onStop;
 
 	public CleanupConfig() {
@@ -44,4 +45,5 @@ public boolean cleanupOnStart() {
 	public boolean cleanupOnStop() {
 		return this.onStop;
 	}
+
 }

spring-kafka/src/main/java/org/springframework/kafka/core/StreamsBuilderFactoryBean.java

@@ -44,6 +44,7 @@ public class StreamsBuilderFactoryBean extends AbstractFactoryBean<StreamsBuilde
 	private static final int DEFAULT_CLOSE_TIMEOUT = 10;
 
 	private final StreamsConfig streamsConfig;
+
 	private final CleanupConfig cleanupConfig;
 
 	private KafkaStreams kafkaStreams;
@@ -79,6 +80,7 @@ public StreamsBuilderFactoryBean(StreamsConfig streamsConfig) {
 	 */
 	public StreamsBuilderFactoryBean(StreamsConfig streamsConfig, CleanupConfig cleanupConfig) {
 		Assert.notNull(streamsConfig, "'streamsConfig' must not be null");
+		Assert.notNull(cleanupConfig, "'cleanupConfig' must not be null");
 		this.streamsConfig = streamsConfig;
 		this.cleanupConfig = cleanupConfig;
 	}
@@ -100,6 +102,7 @@ public StreamsBuilderFactoryBean(Map<String, Object> streamsConfig) {
 	 */
 	public StreamsBuilderFactoryBean(Map<String, Object> streamsConfig, CleanupConfig cleanupConfig) {
 		Assert.notNull(streamsConfig, "'streamsConfig' must not be null");
+		Assert.notNull(cleanupConfig, "'cleanupConfig' must not be null");
 		this.streamsConfig = new StreamsConfig(streamsConfig);
 		this.cleanupConfig = cleanupConfig;
 	}

spring-kafka/src/test/java/org/springframework/kafka/core/StreamsBuilderFactoryBeanTest.java renamed to spring-kafka/src/test/java/org/springframework/kafka/core/StreamsBuilderFactoryBeanTests.java

@@ -44,11 +44,12 @@
 
 /**
  * @author Pawel Szymczyk
+ * @author Artme Bilan
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
 @EmbeddedKafka
-public class StreamsBuilderFactoryBeanTest {
+public class StreamsBuilderFactoryBeanTests {
 
 	private static final String APPLICATION_ID = "testCleanupStreams";
 
@@ -84,18 +85,19 @@ public static class KafkaStreamsConfiguration {
 		private String brokerAddresses;
 
 		@Bean(name = KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_BUILDER_BEAN_NAME)
-		public StreamsBuilderFactoryBean defaultKafkaStreamsBuilder() throws IOException {
+		public StreamsBuilderFactoryBean defaultKafkaStreamsBuilder() {
 			return new StreamsBuilderFactoryBean(kStreamsConfigs(), new CleanupConfig(true, true));
 		}
 
 		@Bean(name = KafkaStreamsDefaultConfiguration.DEFAULT_STREAMS_CONFIG_BEAN_NAME)
-		public StreamsConfig kStreamsConfigs() throws IOException {
+		public StreamsConfig kStreamsConfigs() {
 			Map<String, Object> props = new HashMap<>();
 			props.put(StreamsConfig.APPLICATION_ID_CONFIG, APPLICATION_ID);
 			props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, this.brokerAddresses);
 			props.put(StreamsConfig.STATE_DIR_CONFIG, stateStoreDir.toString());
 			return new StreamsConfig(props);
 		}
+
 	}
 
 }