SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-7: Add checkstyle and javaformat plugins

Browse Source 
Fixes: #7

* Run `./gradlew format`
* Updates from PR review suggestions
This commit is contained in:
Chris Bono
2023-12-29 21:08:58 -06:00
committed by Artem Bilan
parent 84e732da08
commit 836708f0f2
357 changed files with 4344 additions and 4519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java
View File

@@ -63,17 +63,11 @@ public class AggregatorFunctionConfiguration {
private BeanFactory beanFactory;
@Bean
public Function<Flux<Message<?>>, Flux<Message<?>>> aggregatorFunction(
FluxMessageChannel inputChannel,
FluxMessageChannel outputChannel
) {
public Function<Flux<Message<?>>, Flux<Message<?>>> aggregatorFunction(FluxMessageChannel inputChannel,
FluxMessageChannel outputChannel) {
return input -> Flux.from(outputChannel)
.doOnRequest((request) ->
inputChannel.subscribeTo(
input.map((inputMessage) ->
MessageBuilder.fromMessage(inputMessage)
.removeHeader("kafka_consumer")
.build())));
.doOnRequest((request) -> inputChannel.subscribeTo(input.map((
inputMessage) -> MessageBuilder.fromMessage(inputMessage).removeHeader("kafka_consumer").build())));
}
@Bean
@@ -88,13 +82,10 @@ public class AggregatorFunctionConfiguration {
@Bean
@ServiceActivator(inputChannel = "inputChannel")
public AggregatorFactoryBean aggregator(
@Nullable CorrelationStrategy correlationStrategy,
@Nullable ReleaseStrategy releaseStrategy,
@Nullable MessageGroupProcessor messageGroupProcessor,
@Nullable MessageGroupStore messageStore,
@Qualifier("outputChannel") MessageChannel outputChannel,
@Nullable ComponentCustomizer<AggregatorFactoryBean> aggregatorCustomizer) {
public AggregatorFactoryBean aggregator(@Nullable CorrelationStrategy correlationStrategy,
@Nullable ReleaseStrategy releaseStrategy, @Nullable MessageGroupProcessor messageGroupProcessor,
@Nullable MessageGroupStore messageStore, @Qualifier("outputChannel") MessageChannel outputChannel,
@Nullable ComponentCustomizer<AggregatorFactoryBean> aggregatorCustomizer) {
AggregatorFactoryBean aggregator = new AggregatorFactoryBean();
aggregator.setExpireGroupsUponCompletion(true);
@@ -149,14 +140,10 @@ public class AggregatorFunctionConfiguration {
return new ExpressionEvaluatingMessageGroupProcessor(this.properties.getAggregation().getExpressionString());
}
@Configuration
@ConditionalOnMissingBean(MessageGroupStore.class)
@Import({
MessageStoreConfiguration.Mongo.class,
MessageStoreConfiguration.Redis.class,
MessageStoreConfiguration.Jdbc.class
})
@Import({ MessageStoreConfiguration.Mongo.class, MessageStoreConfiguration.Redis.class,
MessageStoreConfiguration.Jdbc.class })
protected static class MessageStoreAutoConfiguration {
}

3
function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java
View File

@@ -55,7 +55,8 @@ public class AggregatorFunctionProperties {
private String messageStoreType = MessageStoreType.SIMPLE;
/**
* Persistence message store entity: table prefix in RDBMS, collection name in MongoDb, etc.
* Persistence message store entity: table prefix in RDBMS, collection name in
* MongoDb, etc.
*/
private String messageStoreEntity;

21
function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/ExcludeStoresAutoConfigurationEnvironmentPostProcessor.java
View File

@@ -32,8 +32,9 @@ import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertiesPropertySource;
/**
* An {@link EnvironmentPostProcessor} to add {@code spring.autoconfigure.exclude} property
* since we can't use {@code application.properties} from the library perspective.
* An {@link EnvironmentPostProcessor} to add {@code spring.autoconfigure.exclude}
* property since we can't use {@code application.properties} from the library
* perspective.
*
* @author Artem Bilan
* @author Corneil du Plessis
@@ -45,16 +46,14 @@ public class ExcludeStoresAutoConfigurationEnvironmentPostProcessor implements E
MutablePropertySources propertySources = environment.getPropertySources();
Properties properties = new Properties();
properties.setProperty("spring.autoconfigure.exclude",
DataSourceAutoConfiguration.class.getName() + ", " +
DataSourceTransactionManagerAutoConfiguration.class.getName() + ", " +
MongoAutoConfiguration.class.getName() + ", " +
MongoDataAutoConfiguration.class.getName() + ", " +
MongoRepositoriesAutoConfiguration.class.getName() + ", " +
RedisAutoConfiguration.class.getName() + ", " +
RedisRepositoriesAutoConfiguration.class.getName());
properties.setProperty("spring.autoconfigure.exclude", DataSourceAutoConfiguration.class.getName() + ", "
+ DataSourceTransactionManagerAutoConfiguration.class.getName() + ", "
+ MongoAutoConfiguration.class.getName() + ", " + MongoDataAutoConfiguration.class.getName() + ", "
+ MongoRepositoriesAutoConfiguration.class.getName() + ", " + RedisAutoConfiguration.class.getName()
+ ", " + RedisRepositoriesAutoConfiguration.class.getName());
propertySources.addLast(new PropertiesPropertySource("aggregator.exclude.stores.auto-configuration", properties));
propertySources
.addLast(new PropertiesPropertySource("aggregator.exclude.stores.auto-configuration", properties));
}
}

27
function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/MessageStoreConfiguration.java
View File

@@ -40,11 +40,10 @@ import org.springframework.integration.store.MessageGroupStore;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.StringUtils;
/**
* A helper class containing configuration classes for particular technologies
* to expose an appropriate {@link org.springframework.integration.store.MessageStore} bean
* via matched configuration properties.
* A helper class containing configuration classes for particular technologies to expose
* an appropriate {@link org.springframework.integration.store.MessageStore} bean via
* matched configuration properties.
*
* @author Artem Bilan
* @author Corneil du Plessis
@@ -52,11 +51,9 @@ import org.springframework.util.StringUtils;
class MessageStoreConfiguration {
@ConditionalOnClass(ConfigurableMongoDbMessageStore.class)
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX,
name = "message-store-type",
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX, name = "message-store-type",
havingValue = AggregatorFunctionProperties.MessageStoreType.MONGODB)
@Import({ MongoAutoConfiguration.class,
MongoDataAutoConfiguration.class })
@Import({ MongoAutoConfiguration.class, MongoDataAutoConfiguration.class })
static class Mongo {
@Bean
@@ -72,15 +69,14 @@ class MessageStoreConfiguration {
@Bean
@Primary
public MongoCustomConversions mongoDbCustomConversions() {
return new MongoCustomConversions(Arrays.asList(
new MessageToBinaryConverter(), new BinaryToMessageConverter()));
return new MongoCustomConversions(
Arrays.asList(new MessageToBinaryConverter(), new BinaryToMessageConverter()));
}
}
@ConditionalOnClass(RedisMessageStore.class)
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX,
name = "message-store-type",
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX, name = "message-store-type",
havingValue = AggregatorFunctionProperties.MessageStoreType.REDIS)
@Import(RedisAutoConfiguration.class)
static class Redis {
@@ -93,12 +89,9 @@ class MessageStoreConfiguration {
}
@ConditionalOnClass(JdbcMessageStore.class)
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX,
name = "message-store-type",
@ConditionalOnProperty(prefix = AggregatorFunctionProperties.PREFIX, name = "message-store-type",
havingValue = AggregatorFunctionProperties.MessageStoreType.JDBC)
@Import({
DataSourceAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class })
@Import({ DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class })
static class Jdbc {
@Bean

2
function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/AbstractAggregatorFunctionTests.java
View File

@@ -48,9 +48,11 @@ public abstract class AbstractAggregatorFunctionTests {
@SpringBootApplication
public static class AggregatorFunctionTestApplication {
public static void main(String[] args) {
SpringApplication.run(AggregatorFunctionTestApplication.class, args);
}
}
}

30
function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java
View File

@@ -38,13 +38,10 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Artem Bilan
*/
@TestPropertySource(properties = {
"aggregator.correlation=T(Thread).currentThread().id",
@TestPropertySource(properties = { "aggregator.correlation=T(Thread).currentThread().id",
"aggregator.release=!messages.?[payload == 'bar'].empty",
"aggregator.aggregation=#this.?[payload == 'foo'].![payload]",
"aggregator.messageStoreType=mongodb",
"aggregator.message-store-entity=aggregatorTest"
})
"aggregator.aggregation=#this.?[payload == 'foo'].![payload]", "aggregator.messageStoreType=mongodb",
"aggregator.message-store-entity=aggregatorTest" })
@AutoConfigureDataMongo
public class CustomPropsAndMongoMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests
implements MongoDbTestContainerSupport {
@@ -57,22 +54,19 @@ public class CustomPropsAndMongoMessageStoreAggregatorTests extends AbstractAggr
@Test
public void test() {
Flux<Message<?>> input =
Flux.just("foo", "bar")
.map(GenericMessage::new);
Flux<Message<?>> input = Flux.just("foo", "bar").map(GenericMessage::new);
Flux<Message<?>> output = this.aggregatorFunction.apply(input);
output.as(StepVerifier::create)
.assertNext((message) ->
assertThat(message)
.extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(1)
.element(0).isEqualTo("foo"))
.thenCancel()
.verify(Duration.ofSeconds(10));
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(1)
.element(0)
.isEqualTo("foo"))
.thenCancel()
.verify(Duration.ofSeconds(10));
assertThat(this.messageGroupStore).isInstanceOf(ConfigurableMongoDbMessageStore.class);
assertThat(TestUtils.getPropertyValue(this.messageGroupStore, "collectionName")).isEqualTo("aggregatorTest");

20
function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java
View File

@@ -40,12 +40,13 @@ import static org.assertj.core.api.Assertions.assertThat;
@Disabled("Fails on CI sporadically")
@TestPropertySource(properties = "aggregator.message-store-type=simple")
public class DefaultAggregatorTests extends AbstractAggregatorFunctionTests {
private static final Logger logger = LoggerFactory.getLogger(DefaultAggregatorTests.class);
@Test
public void test() {
Flux<Message<?>> input =
Flux.just(MessageBuilder.withPayload("2")
Flux<Message<?>> input = Flux.just(
MessageBuilder.withPayload("2")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
@@ -57,20 +58,13 @@ public class DefaultAggregatorTests extends AbstractAggregatorFunctionTests {
.build());
Flux<Message<?>> output = this.aggregatorFunction.apply(input.log("DefaultAggregatorTests:input"));
output.log("DefaultAggregatorTests:output")
.as(StepVerifier::create)
.assertNext((message) -> {
assertThat(message)
.extracting(Message::getPayload)
.asList()
.hasSize(2)
.contains("1", "2");
})
.thenCancel()
.verify(Duration.ofSeconds(30));
output.log("DefaultAggregatorTests:output").as(StepVerifier::create).assertNext((message) -> {
assertThat(message).extracting(Message::getPayload).asList().hasSize(2).contains("1", "2");
}).thenCancel().verify(Duration.ofSeconds(30));
assertThat(this.messageGroupStore).isNull();
assertThat(this.aggregatingMessageHandler.getMessageStore()).isInstanceOf(SimpleMessageStore.class);
}
}

38
function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java
View File

@@ -40,30 +40,28 @@ public class JdbcMessageStoreAggregatorTests extends AbstractAggregatorFunctionT
@Test
public void test() {
Flux<Message<?>> input =
Flux.just(MessageBuilder.withPayload("2")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
.build(),
MessageBuilder.withPayload("1")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 1)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
.build());
Flux<Message<?>> input = Flux.just(
MessageBuilder.withPayload("2")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
.build(),
MessageBuilder.withPayload("1")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 1)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
.build());
Flux<Message<?>> output = this.aggregatorFunction.apply(input);
output.as(StepVerifier::create)
.assertNext((message) ->
assertThat(message)
.extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(10));
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(10));
assertThat(this.messageGroupStore).isInstanceOf(JdbcMessageStore.class);

19
function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java
View File

@@ -41,7 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Artem Bilan
*/
@TestPropertySource(properties = "aggregator.message-store-type=redis")
public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests implements RedisTestContainerSupport {
public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests
implements RedisTestContainerSupport {
@DynamicPropertySource
static void redisProperties(DynamicPropertyRegistry registry) {
@@ -52,8 +53,8 @@ public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunction
public void test() {
InputStream fakeNonSerializableKafkaConsumer = new ByteArrayInputStream(new byte[0]);
Flux<Message<?>> input =
Flux.just(MessageBuilder.withPayload("2")
Flux<Message<?>> input = Flux.just(
MessageBuilder.withPayload("2")
.setHeader(IntegrationMessageHeaderAccessor.CORRELATION_ID, "my_correlation")
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_NUMBER, 2)
.setHeader(IntegrationMessageHeaderAccessor.SEQUENCE_SIZE, 2)
@@ -68,13 +69,11 @@ public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunction
Flux<Message<?>> output = this.aggregatorFunction.apply(input);
output.as(StepVerifier::create)
.assertNext((message) ->
assertThat(message)
.extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.assertNext((message) -> assertThat(message).extracting(Message::getPayload)
.isInstanceOf(List.class)
.asList()
.hasSize(2)
.contains("1", "2"))
.thenCancel()
.verify(Duration.ofSeconds(10));