From 7864658d01b5875133132eea5a029842cd16ab02 Mon Sep 17 00:00:00 2001 From: abilan Date: Mon, 14 Nov 2022 10:55:21 -0500 Subject: [PATCH] GH-3686: Apply SF editor config Fixes https://github.com/spring-projects/spring-integration/issues/3686 * Add `src/idea` with respective editor config for IntelliJ IDEA. Must be imported into an IDE * Add `src/eclipse` with respective editor config for Eclipse/STS * Reformat imports in source code according a new editor config --- .github/release-files-spec.json | 12 +- .github/workflows/central-sync-close.yml | 18 +- .github/workflows/central-sync-create.yml | 72 +-- .github/workflows/central-sync-release.yml | 18 +- .../AbstractAmqpInboundAdapterParser.java | 42 +- .../dsl/AmqpBaseOutboundEndpointSpec.java | 4 +- .../dsl/AmqpInboundChannelAdapterSpec.java | 2 +- .../amqp/dsl/AmqpInboundGatewaySpec.java | 4 +- .../integration/amqp/dsl/RabbitStream.java | 6 +- ...RabbitStreamInboundChannelAdapterSpec.java | 6 +- ...bitStreamMessageListenerContainerSpec.java | 5 +- .../inbound/AmqpInboundChannelAdapter.java | 8 +- .../amqp/inbound/AmqpInboundGateway.java | 23 +- .../amqp/inbound/AmqpMessageSource.java | 29 +- .../amqp/outbound/AmqpOutboundEndpoint.java | 6 +- .../support/BoundRabbitChannelAdvice.java | 5 +- .../amqp/support/DefaultAmqpHeaderMapper.java | 10 +- .../amqp/support/EndpointUtils.java | 12 +- ...alAckListenerExecutionFailedException.java | 4 +- .../amqp/channel/ChannelTests.java | 14 +- .../DispatcherHasNoSubscribersTests.java | 23 +- .../amqp/config/AmqpChannelParserTests.java | 6 +- .../AmqpInboundChannelAdapterParserTests.java | 6 +- .../config/AmqpInboundGatewayParserTests.java | 11 +- ...AmqpOutboundChannelAdapterParserTests.java | 73 ++- .../AmqpOutboundGatewayParserTests.java | 116 ++-- .../OutboundGatewayIntegrationTests.java | 6 +- .../amqp/config/OutboundGatewayTests.java | 16 +- .../integration/amqp/dsl/AmqpTests.java | 51 +- .../AmqpMessageSourceIntegrationTests.java | 8 +- .../amqp/inbound/AmqpMessageSourceTests.java | 34 +- .../amqp/inbound/InboundEndpointTests.java | 69 +-- .../amqp/inbound/ManualAckTests.java | 9 +- .../outbound/AmqpOutboundEndpointTests.java | 18 +- .../outbound/AmqpOutboundEndpointTests2.java | 8 +- .../amqp/outbound/AsyncAmqpGatewayTests.java | 23 +- .../amqp/outbound/OutboundEndpointTests.java | 24 +- .../RabbitStreamMessageHandlerTests.java | 11 +- ...ndRabbitChannelAdviceIntegrationTests.java | 12 +- .../BoundRabbitChannelAdviceTests.java | 31 +- .../support/DefaultAmqpHeaderMapperTests.java | 10 +- .../JsonConverterCompatibilityTests.java | 10 +- .../amqp/support/MappingUtilsTests.java | 8 +- .../camel/dsl/CamelMessageHandlerSpec.java | 4 +- .../camel/support/CamelHeaderMapper.java | 4 +- .../integration/camel/dsl/CamelDslTests.java | 4 +- .../outbound/CamelMessageHandlerTests.java | 6 +- .../dsl/CassandraMessageHandlerSpec.java | 4 +- .../outbound/CassandraMessageHandler.java | 18 +- .../cassandra/IntegrationTestConfig.java | 2 +- ...sandraOutboundAdapterIntegrationTests.java | 11 +- .../CassandraOutboundAdapterParserTests.java | 4 +- .../config/CassandraParserUtilsTests.java | 4 +- .../cassandra/dsl/CassandraDslTests.java | 7 +- .../CassandraMessageHandlerTests.java | 13 +- .../integration/JavaUtils.java | 3 +- .../AbstractCorrelatingMessageHandler.java | 6 +- .../FluxAggregatorMessageHandler.java | 12 +- .../aggregator/MessageGroupExpiredEvent.java | 26 +- .../aggregator/ReleaseStrategy.java | 3 +- .../integration/annotation/Aggregator.java | 2 +- .../integration/annotation/Aggregators.java | 2 +- .../integration/annotation/BridgeFrom.java | 2 +- .../annotation/BridgeFromRepeatable.java | 2 +- .../integration/annotation/BridgeTo.java | 2 +- .../annotation/BridgeToRepeatable.java | 2 +- .../annotation/CorrelationStrategy.java | 6 +- .../integration/annotation/Filter.java | 4 +- .../integration/annotation/Filters.java | 2 +- .../integration/annotation/Gateway.java | 6 +- .../integration/annotation/GatewayHeader.java | 4 +- .../annotation/InboundChannelAdapter.java | 2 +- .../annotation/InboundChannelAdapters.java | 2 +- .../annotation/IntegrationComponentScan.java | 10 +- .../annotation/MessagingGateway.java | 2 +- .../integration/annotation/Payloads.java | 4 +- .../integration/annotation/Publisher.java | 4 +- .../integration/annotation/Role.java | 4 +- .../integration/annotation/Router.java | 4 +- .../integration/annotation/Routers.java | 2 +- .../annotation/ServiceActivator.java | 4 +- .../annotation/ServiceActivators.java | 2 +- .../integration/annotation/Splitter.java | 4 +- .../integration/annotation/Splitters.java | 2 +- .../integration/annotation/Transformer.java | 4 +- .../integration/annotation/Transformers.java | 2 +- .../annotation/UseSpelInvoker.java | 4 +- .../channel/FluxMessageChannel.java | 11 +- .../integration/channel/NullChannel.java | 14 +- .../integration/channel/QueueChannel.java | 6 +- .../GlobalChannelInterceptorWrapper.java | 4 +- ...ervationPropagationChannelInterceptor.java | 8 +- ...eadStatePropagationChannelInterceptor.java | 6 +- .../codec/kryo/AbstractKryoCodec.java | 6 +- .../codec/kryo/AbstractKryoRegistrar.java | 5 +- .../codec/kryo/CompositeKryoRegistrar.java | 8 +- .../codec/kryo/KryoClassListRegistrar.java | 6 +- .../codec/kryo/KryoClassMapRegistrar.java | 6 +- .../codec/kryo/MessageHeadersSerializer.java | 4 +- .../codec/kryo/MessageKryoRegistrar.java | 8 +- .../kryo/MutableMessageHeadersSerializer.java | 6 +- .../integration/codec/kryo/PojoCodec.java | 7 +- .../codec/kryo/RegistrationIds.java | 5 +- ...AbstractMethodAnnotationPostProcessor.java | 3 +- ...stractSimpleMessageHandlerFactoryBean.java | 46 +- .../config/ChannelInitializer.java | 4 +- .../config/ConsumerEndpointFactoryBean.java | 3 +- .../config/EnableIntegrationManagement.java | 4 +- .../config/GlobalChannelInterceptor.java | 4 +- .../IntegrationManagementConfiguration.java | 4 +- .../IntegrationManagementConfigurer.java | 3 +- ...ionSimpleEvaluationContextFactoryBean.java | 8 +- ...tractDelegatingConsumerEndpointParser.java | 14 +- .../AbstractOutboundChannelAdapterParser.java | 10 +- .../xml/AbstractOutboundGatewayParser.java | 3 +- .../config/xml/ChannelInterceptorParser.java | 4 +- .../xml/HeaderEnricherParserSupport.java | 8 +- .../config/xml/IntegrationNamespaceUtils.java | 6 +- .../config/xml/RetryAdviceParser.java | 1 + .../config/xml/SelectorChainParser.java | 4 +- ...ansactionSynchronizationFactoryParser.java | 10 +- .../context/IntegrationProperties.java | 4 +- .../OrderedAwareCopyOnWriteArraySet.java | 4 +- .../integration/dsl/BarrierSpec.java | 6 +- .../dsl/BaseIntegrationFlowDefinition.java | 5 +- .../integration/dsl/ConsumerEndpointSpec.java | 14 +- .../integration/dsl/EndpointSpec.java | 6 +- .../integration/dsl/EnricherSpec.java | 6 +- .../integration/dsl/HeaderEnricherSpec.java | 6 +- .../dsl/IntegrationComponentSpec.java | 4 +- .../dsl/IntegrationFlowAdapter.java | 3 +- .../integration/dsl/MessageSourceSpec.java | 4 +- .../dsl/PublisherIntegrationFlow.java | 5 +- .../integration/dsl/Transformers.java | 7 +- .../endpoint/AbstractMessageSource.java | 6 +- .../endpoint/AbstractPollingEndpoint.java | 7 +- .../endpoint/MessageProducerSupport.java | 5 +- .../ReactiveMessageSourceProducer.java | 6 +- .../endpoint/ReactiveStreamsConsumer.java | 11 +- .../endpoint/SourcePollingChannelAdapter.java | 3 +- .../integration/events/IntegrationEvent.java | 3 +- .../expression/ExpressionUtils.java | 4 +- ...oadableResourceBundleExpressionSource.java | 6 +- .../filter/MethodInvokingSelector.java | 4 +- .../gateway/GatewayProxyFactoryBean.java | 3 +- .../gateway/MessagingGatewaySupport.java | 7 +- .../graph/IntegrationGraphServer.java | 4 +- .../graph/MicrometerNodeEnhancer.java | 20 +- .../handler/AbstractMessageHandler.java | 5 +- .../AbstractMessageProducingHandler.java | 9 +- .../AbstractReactiveMessageHandler.java | 6 +- ...ProducingPostProcessingMessageHandler.java | 6 +- .../handler/LambdaMessageProcessor.java | 2 +- .../handler/MessageHandlerSupport.java | 4 +- .../advice/AbstractRequestHandlerAdvice.java | 8 +- .../advice/CacheRequestHandlerAdvice.java | 4 +- .../RateLimiterRequestHandlerAdvice.java | 10 +- .../advice/ReactiveRequestHandlerAdvice.java | 5 +- ...inuationHandlerMethodArgumentResolver.java | 4 +- .../integration/history/MessageHistory.java | 9 +- .../history/MessageHistoryConfigurer.java | 4 +- .../JsonNodeWrapperToJsonNodeConverter.java | 6 +- .../json/JsonPropertyAccessor.java | 12 +- .../mapping/BytesMessageMapper.java | 5 +- .../metadata/ConcurrentMetadataStore.java | 3 +- .../selector/MessageSelectorChain.java | 39 +- .../splitter/AbstractMessageSplitter.java | 9 +- .../store/MessageGroupFactory.java | 4 +- .../store/SimpleMessageGroupFactory.java | 7 +- .../support/ErrorMessageUtils.java | 3 +- .../converter/SimpleMessageConverter.java | 4 +- .../AdviceMessageJacksonDeserializer.java | 8 +- .../EmbeddedJsonHeadersMessageMapper.java | 7 +- .../json/ErrorMessageJacksonDeserializer.java | 10 +- .../GenericMessageJacksonDeserializer.java | 8 +- .../json/Jackson2JsonMessageParser.java | 10 +- .../json/Jackson2JsonObjectMapper.java | 12 +- .../support/json/JacksonJsonUtils.java | 10 +- .../json/MessageHeadersJacksonSerializer.java | 6 +- .../json/MessageJacksonDeserializer.java | 8 +- .../support/json/MimeTypeSerializer.java | 6 +- .../MutableMessageJacksonDeserializer.java | 8 +- .../support/locks/DefaultLockRegistry.java | 3 +- .../management/IntegrationManagement.java | 4 +- .../micrometer/MicrometerMetricsCaptor.java | 12 +- .../MicrometerMetricsCaptorConfiguration.java | 6 +- ...MicrometerMetricsCaptorImportSelector.java | 4 +- .../observation/MessageReceiverContext.java | 4 +- .../MessageRequestReplyReceiverContext.java | 4 +- .../observation/MessageSenderContext.java | 4 +- .../support/utils/PatternMatchUtils.java | 5 +- ...ngTransactionSynchronizationProcessor.java | 22 +- .../transaction/PseudoTransactionManager.java | 3 +- .../PayloadTypeConvertingTransformer.java | 3 +- .../integration/util/CoroutinesUtils.java | 4 +- .../util/IntegrationReactiveUtils.java | 15 +- .../integration/util/StackTraceUtils.java | 5 +- .../util/WhileLockedProcessor.java | 4 +- ...bstractCorrelatingMessageHandlerTests.java | 18 +- ...atingMessageGroupProcessorHeaderTests.java | 8 +- .../aggregator/AggregatorTests.java | 8 +- .../BarrierMessageHandlerTests.java | 12 +- .../aggregator/ConcurrentAggregatorTests.java | 8 +- .../CorrelatingMessageBarrierTests.java | 14 +- ...elatingMessageHandlerIntegrationTests.java | 16 +- .../CorrelatingMessageHandlerTests.java | 18 +- .../CorrelationStrategyAdapterTests.java | 10 +- ...ionEvaluatingCorrelationStrategyTests.java | 8 +- ...nEvaluatingMessageGroupProcessorTests.java | 10 +- ...ressionEvaluatingReleaseStrategyTests.java | 10 +- .../FluxAggregatorMessageHandlerTests.java | 23 +- ...aderAttributeCorrelationStrategyTests.java | 7 +- .../MessageSequenceComparatorTests.java | 6 +- ...hodInvokingMessageGroupProcessorTests.java | 12 +- .../MethodInvokingReleaseStrategyTests.java | 8 +- .../aggregator/ResequencerTests.java | 8 +- ...esequencingMessageGroupProcessorTests.java | 10 +- .../SequenceSizeReleaseStrategyTests.java | 6 +- ...CountSequenceSizeReleaseStrategyTests.java | 6 +- .../AggregatorExpressionIntegrationTests.java | 6 +- .../AggregatorIntegrationTests.java | 6 +- .../AggregatorSupportedUseCasesTests.java | 6 +- .../AnnotationAggregatorTests.java | 4 +- ...aultMessageAggregatorIntegrationTests.java | 6 +- ...vokingAggregatorReturningMessageTests.java | 6 +- .../ResequencerIntegrationTests.java | 6 +- .../scenarios/AggregationResendTests.java | 6 +- .../AggregatorReplyChannelTests.java | 6 +- ...regatorWithCustomReleaseStrategyTests.java | 12 +- .../scenarios/NestedAggregationTests.java | 6 +- .../PartialSequencesWithGapsTests.java | 6 +- .../AnnotationConfigRegistrationTests.java | 6 +- ...MessagePublishingAnnotationUsageTests.java | 6 +- .../MessagePublishingInterceptorTests.java | 6 +- ...essagePublishingInterceptorUsageTests.java | 6 +- ...nnotationPublisherMetadataSourceTests.java | 6 +- .../aop/PublisherAnnotationAdvisorTests.java | 10 +- .../aop/PublisherExpressionTests.java | 6 +- .../ApplicationContextMessageBusTests.java | 6 +- .../bus/DirectChannelSubscriptionTests.java | 6 +- .../channel/CGLibProxyChannelTests.java | 6 +- .../channel/ChannelPurgerTests.java | 6 +- .../channel/DatatypeChannelTests.java | 6 +- .../channel/DirectChannelParserTests.java | 6 +- .../channel/DirectChannelTests.java | 14 +- .../DispatcherHasNoSubscribersTests.java | 8 +- .../DispatchingChannelErrorHandlingTests.java | 8 +- .../channel/ExecutorChannelTests.java | 14 +- .../channel/FixedSubscriberChannelTests.java | 8 +- .../IntegrationReactiveUtilsTests.java | 17 +- ...dDispatcherConfigurationScenarioTests.java | 22 +- .../integration/channel/P2pChannelTests.java | 16 +- .../channel/PriorityChannelTests.java | 6 +- .../channel/PublishSubscribeChannelTests.java | 13 +- .../channel/QueueChannelTests.java | 10 +- ...ctionSynchronizationQueueChannelTests.java | 6 +- .../config/AutoGeneratedChannelTests.java | 6 +- .../ChannelCapacityPlaceholderTests.java | 6 +- .../channel/config/ChannelParserTests.java | 8 +- .../ChannelWithCustomQueueParserTests.java | 6 +- .../config/DispatchingChannelParserTests.java | 6 +- .../config/RendezvousChannelParserTests.java | 6 +- .../config/ThreadLocalChannelParserTests.java | 6 +- .../interceptor/ChannelInterceptorTests.java | 10 +- ...obalChannelInterceptorSubElementTests.java | 6 +- .../GlobalChannelInterceptorTests.java | 6 +- .../interceptor/GlobalWireTapTests.java | 6 +- .../ImplicitConsumerChannelTests.java | 6 +- .../MessageSelectingInterceptorTests.java | 6 +- ...ionPropagationChannelInterceptorTests.java | 43 +- .../channel/interceptor/WireTapTests.java | 6 +- .../reactive/FluxMessageChannelTests.java | 9 +- .../ReactiveStreamsConsumerTests.java | 29 +- .../registry/HeaderChannelRegistryTests.java | 12 +- .../codec/kryo/CompositeCodecTests.java | 6 +- .../codec/kryo/FileKryoRegistrarTests.java | 6 +- .../codec/kryo/KryoCodecTests.java | 6 +- .../integration/config/Adder.java | 4 +- .../config/AggregatorParserTests.java | 6 +- ...ggregatorWithCorrelationStrategyTests.java | 6 +- ...AggregatorWithMessageStoreParserTests.java | 6 +- .../integration/config/ChainParserTests.java | 20 +- .../config/ChannelAdapterParserTests.java | 10 +- .../ChannelWithMessageStoreParserTests.java | 6 +- ...tionStrategyInvalidConfigurationTests.java | 4 +- .../config/EndpointParserTests.java | 6 +- .../integration/config/FilterParserTests.java | 6 +- ...lobalChannelInterceptorProcessorTests.java | 16 +- .../config/IdGeneratorConfigurerTests.java | 14 +- .../InvalidPriorityChannelParserTests.java | 6 +- .../InvalidQueueChannelParserTests.java | 6 +- .../config/MaxValueReleaseStrategy.java | 6 +- .../config/MessageBusParserTests.java | 6 +- .../PublishSubscribeChannelParserTests.java | 9 +- .../ReleaseStrategyFactoryBeanTests.java | 8 +- .../config/ResequencerParserTests.java | 8 +- ...esequencerWithMessageStoreParserTests.java | 6 +- .../RouterFactoryBeanDelegationTests.java | 6 +- .../config/SelectorChainParserTests.java | 6 +- ...ActivatorAnnotationPostProcessorTests.java | 4 +- ...PollingChannelAdapterFactoryBeanTests.java | 22 +- .../config/TestAggregatorBean.java | 4 +- .../config/TopLevelSelectorParserTests.java | 6 +- .../config/WireTapParserTests.java | 6 +- .../annotation/AggregatorAnnotationTests.java | 16 +- .../AnnotatedEndpointActivationTests.java | 6 +- .../BridgeFromIntegrationTests.java | 8 +- .../CustomMessagingAnnotationTests.java | 12 +- .../FilterAnnotationPostProcessorTests.java | 18 +- ...ationPostProcessorAopIntegrationTests.java | 6 +- ...MessagingAnnotationPostProcessorTests.java | 6 +- ...ingAnnotationsWithBeanAnnotationTests.java | 15 +- .../RouterAnnotationPostProcessorTests.java | 5 +- .../SplitterAnnotationPostProcessorTests.java | 4 +- .../annotation/SubscriberOrderTests.java | 4 +- ...nnotatedEndpointWithDefaultAggregator.java | 4 +- ...tAnnotatedEndpointWithReleaseStrategy.java | 4 +- .../config/xml/BarrierParserTests.java | 6 +- .../config/xml/BridgeParserTests.java | 6 +- .../config/xml/ChainElementsFailureTests.java | 8 +- .../config/xml/ChannelAutoCreationTests.java | 3 +- .../config/xml/ClaimCheckParserTests.java | 6 +- .../config/xml/ContextHierarchyTests.java | 8 +- .../config/xml/ControlBusChainTests.java | 6 +- .../xml/ControlBusExplicitPollerTests.java | 6 +- .../config/xml/ControlBusPollerTests.java | 6 +- .../ControlBusRecipientListRouterTests.java | 19 +- .../config/xml/ControlBusTests.java | 6 +- .../config/xml/ConverterParserTests.java | 6 +- ...serWithExistingConversionServiceTests.java | 10 +- .../config/xml/CronTriggerParserTests.java | 6 +- ...eanFactoryPostProcessorHierarchyTests.java | 6 +- ...figuringBeanFactoryPostProcessorTests.java | 10 +- ...aultOutboundChannelAdapterParserTests.java | 6 +- .../config/xml/DelayerParserTests.java | 6 +- .../config/xml/DelayerUsageTests.java | 8 +- .../xml/DelegatingConsumerParserTests.java | 10 +- ...herMaxSubscribersOverrideDefaultTests.java | 14 +- .../xml/DispatcherMaxSubscribersTests.java | 6 +- .../config/xml/EndpointRoleParserTests.java | 9 +- .../config/xml/EnricherParserTests.java | 6 +- .../config/xml/EnricherParserTests2.java | 6 +- .../config/xml/EnricherParserTests3.java | 10 +- .../config/xml/EnricherParserTests4.java | 6 +- .../config/xml/EnricherParserTests5.java | 6 +- ...icherParserTestsWithoutRequestChannel.java | 6 +- ...rserWithRequestPayloadExpressionTests.java | 6 +- .../xml/ErrorChannelAutoCreationTests.java | 6 +- ...MessageExceptionTypeRouterParserTests.java | 6 +- .../config/xml/GatewayParserTests.java | 15 +- .../HeaderEnricherMethodInvokingTests.java | 6 +- .../xml/HeaderEnricherOverwriteTests.java | 6 +- .../config/xml/HeaderEnricherParserTests.java | 8 +- .../config/xml/HeaderEnricherTests.java | 6 +- .../config/xml/HeaderFilterParserTests.java | 6 +- .../xml/IdempotentReceiverParserTests.java | 16 +- .../InboundChannelAdapterExpressionTests.java | 4 +- ...dChannelAdapterWithDefaultPollerTests.java | 4 +- .../config/xml/InnerBeanConfigTests.java | 6 +- ...nitionHandlerAwareEndpointParserTests.java | 12 +- .../xml/IntervalTriggerParserTests.java | 4 +- .../xml/LoggingChannelAdapterParserTests.java | 8 +- .../MapToObjectTransformerParserTests.java | 32 +- .../MethodInvokingSelectorParserTests.java | 6 +- .../config/xml/NestedChainParserTests.java | 6 +- .../ObjectToMapTransformerParserTests.java | 12 +- .../ObjectToStringTransformerParserTests.java | 6 +- .../config/xml/OrderedHandlersTests.java | 6 +- .../config/xml/PNamespaceTests.java | 6 +- ...adDeserializingTransformerParserTests.java | 8 +- ...loadSerializingTransformerParserTests.java | 6 +- .../config/xml/PollerParserTests.java | 6 +- .../xml/PollerWithErrorChannelTests.java | 12 +- .../xml/PublishingInterceptorParserTests.java | 14 +- .../config/xml/RetryAdviceParserTests.java | 4 +- .../xml/ServiceActivatorParserTests.java | 8 +- .../xml/StreamTransformerParserTests.java | 6 +- .../xml/SyslogTransformerParserTests.java | 6 +- ...tionSynchronizationFactoryParserTests.java | 7 +- .../configuration/EnableIntegrationTests.java | 59 +- .../context/IntegrationContextTests.java | 4 +- .../core/AsyncMessagingTemplateTests.java | 8 +- .../integration/core/MessageHistoryTests.java | 8 +- .../core/MessageIdGenerationTests.java | 31 +- .../core/TimeBasedUUIDGenerator.java | 7 +- ...ggregateMessageDeliveryExceptionTests.java | 6 +- .../BroadcastingDispatcherTests.java | 16 +- .../dispatcher/FailOverDispatcherTests.java | 8 +- .../OrderedAwareCopyOnWriteArraySetTests.java | 8 +- .../dispatcher/PollingTransactionTests.java | 6 +- .../RoundRobinDispatcherConcurrentTests.java | 14 +- .../dispatcher/RoundRobinDispatcherTests.java | 24 +- ...actionalPollerWithMixedAopConfigTests.java | 14 +- .../dispatcher/UnicastingDispatcherTests.java | 6 +- .../dsl/LambdaMessageProcessorTests.java | 6 +- .../integration/dsl/PollersTests.java | 4 +- .../IntegrationFlowCompositionTests.java | 11 +- .../correlation/CorrelationHandlerTests.java | 19 +- .../IntegrationFlowExtensionTests.java | 4 +- .../dsl/flows/IntegrationFlowTests.java | 7 +- .../dsl/flowservices/FlowServiceTests.java | 6 +- .../dsl/gateway/GatewayDslTests.java | 18 +- ...ntegrationComponentSpecLifecycleTests.java | 6 +- .../dsl/manualflow/ManualFlowTests.java | 25 +- .../PublishSubscribeTests.java | 6 +- .../reactivestreams/ReactiveStreamsTests.java | 11 +- .../dsl/routers/NoFallbackAllowedTests.java | 6 +- .../integration/dsl/routers/RouterTests.java | 14 +- .../dsl/transformers/TransformerTests.java | 6 +- .../EnableComponentScanTests.java | 4 +- .../integration/endpoint/BeanNameTests.java | 10 +- .../endpoint/CorrelationIdTests.java | 8 +- ...aluatingMessageSourceIntegrationTests.java | 6 +- ...xpressionEvaluatingMessageSourceTests.java | 8 +- .../endpoint/MessageProducerSupportTests.java | 6 +- .../MessageSourcePollingTemplateTests.java | 22 +- .../endpoint/PollerAdviceTests.java | 15 +- .../PollingConsumerEndpointTests.java | 10 +- .../PollingEndpointErrorHandlingTests.java | 6 +- .../endpoint/PollingLifecycleTests.java | 12 +- .../ProducerAndConsumerAutoStartupTests.java | 6 +- ...PseudoTransactionalMessageSourceTests.java | 10 +- .../ReactiveInboundChannelAdapterTests.java | 11 +- .../ReactiveMessageProducerTests.java | 7 +- .../ReactiveMessageSourceProducerTests.java | 15 +- .../endpoint/ReturnAddressTests.java | 6 +- .../ServiceActivatorEndpointTests.java | 8 +- ...ServiceActivatorMethodResolutionTests.java | 8 +- .../expression/DynamicExpressionTests.java | 6 +- .../expression/ExpressionUtilsTests.java | 6 +- .../expression/ForeignClassloaderTests.java | 6 +- .../expression/ParentContextTests.java | 7 +- ...namicExpressionFilterIntegrationTests.java | 6 +- ...FilterAnnotationMethodResolutionTests.java | 6 +- .../filter/FilterContextTests.java | 6 +- .../filter/MessageFilterTests.java | 6 +- .../filter/MethodInvokingSelectorTests.java | 8 +- .../filter/SpelFilterIntegrationTests.java | 6 +- .../gateway/AsyncGatewayTests.java | 11 +- .../gateway/GatewayInterfaceTests.java | 20 +- .../GatewayInvokingMessageHandlerTests.java | 8 +- ...hodInboundMessageMapperToMessageTests.java | 50 +- .../gateway/GatewayProxyFactoryBeanTests.java | 14 +- .../GatewayProxyMessageMappingTests.java | 6 +- .../gateway/GatewayRequiresReplyTests.java | 8 +- .../gateway/GatewayWithHeaderAnnotations.java | 6 +- .../GatewayWithPayloadExpressionTests.java | 4 +- .../gateway/GatewayXmlAndAnnotationTests.java | 4 +- .../gateway/HeaderEnrichedGatewayTests.java | 6 +- .../gateway/InnerGatewayWithChainTests.java | 7 +- .../gateway/MessagingGatewayTests.java | 8 +- .../MultiMethodGatewayConfigTests.java | 6 +- .../gateway/NestedGatewayTests.java | 20 +- .../integration/gateway/TestService.java | 4 +- .../graph/IntegrationGraphServerTests.java | 15 +- ...ractReplyProducingMessageHandlerTests.java | 12 +- .../handler/AsyncHandlerTests.java | 12 +- .../handler/BridgeHandlerTests.java | 8 +- .../handler/CGLibProxyHandlerTests.java | 6 +- .../handler/CollectionAndArrayTests.java | 10 +- ...CustomConverterMessageProcessingTests.java | 6 +- .../handler/DelayHandlerTests.java | 10 +- ...essionEvaluatingMessageProcessorTests.java | 10 +- .../HeaderAnnotationTransformerTests.java | 8 +- .../handler/LoggingHandlerTests.java | 22 +- .../handler/MessageHandlerChainTests.java | 6 +- .../MethodInvokingHeaderEnricherTests.java | 20 +- ...vokingMessageProcessorAnnotationTests.java | 14 +- .../MethodInvokingMessageProcessorTests.java | 32 +- .../integration/handler/MockHandlerTests.java | 6 +- .../handler/ReactiveMessageHandlerTests.java | 7 +- .../SendTimeoutConfigurationTests.java | 6 +- ...eActivatorDefaultFrameworkMethodTests.java | 7 +- .../ServiceActivatorOnMockitoMockTests.java | 6 +- .../advice/AdvisedMessageHandlerTests.java | 26 +- .../CacheRequestHandlerAdviceTests.java | 6 +- ...onEvaluatingRequestHandlerAdviceTests.java | 6 +- .../advice/IdempotentReceiverTests.java | 8 +- .../RateLimiterRequestHandlerAdviceTests.java | 11 +- ...pelExpressionRetryStateGeneratorTests.java | 6 +- .../MessagingMethodInvocableHelperTests.java | 4 +- .../integration/history/AnnotatedTests.java | 12 +- .../MessageHistoryIntegrationTests.java | 8 +- ...AbstractJsonInboundMessageMapperTests.java | 8 +- ...actJsonSymmetricalMessageMappingTests.java | 6 +- .../json/ContentTypeConversionTests.java | 4 +- .../json/JsonOutboundMessageMapperTests.java | 13 +- .../integration/json/JsonPathTests.java | 15 +- .../json/JsonPropertyAccessorTests.java | 15 +- .../JsonToObjectTransformerParserTests.java | 12 +- .../json/JsonToObjectTransformerTests.java | 12 +- .../JsonTransformersSymmetricalTests.java | 6 +- .../ObjectToJsonTransformerParserTests.java | 7 +- .../json/ObjectToJsonTransformerTests.java | 15 +- .../json/SimpleJsonSerializerTests.java | 6 +- .../integration/json/TestAddress.java | 4 +- .../integration/json/TestPerson.java | 4 +- .../mapping/HeaderMapperTests.java | 6 +- ...pressionEvaluatingMessageHandlerTests.java | 8 +- .../message/GenericMessageTests.java | 6 +- .../message/MessageBuilderAtConfigTests.java | 6 +- .../message/MessageBuilderTests.java | 6 +- .../message/MessageHeadersTests.java | 8 +- .../MethodInvokingMessageHandlerTests.java | 12 +- .../MethodInvokingMessageSourceTests.java | 8 +- .../message/PayloadAndHeaderMappingTests.java | 10 +- .../selector/PayloadTypeSelectorTests.java | 6 +- .../UnexpiredMessageSelectorTests.java | 6 +- ...ropertiesPersistingMetadataStoreTests.java | 6 +- ...ourceInboundChannelAdapterParserTests.java | 6 +- .../ErrorMessageExceptionTypeRouterTests.java | 8 +- .../router/HeaderValueRouterTests.java | 12 +- .../router/MethodInvokingRouterTests.java | 10 +- .../router/MultiChannelRouterTests.java | 8 +- .../router/PayloadTypeRouterTests.java | 8 +- .../router/RecipientListRouterTests.java | 10 +- .../router/RouterConcurrencyTest.java | 10 +- .../integration/router/RouterTests.java | 12 +- ...namicExpressionRouterIntegrationTests.java | 6 +- .../ExceptionTypeRouterParserTests.java | 6 +- ...HeaderValueRouterConvertibleTypeTests.java | 6 +- .../config/HeaderValueRouterParserTests.java | 6 +- .../config/PayloadTypeRouterParserTests.java | 10 +- .../RecipientListRouterParserTests.java | 6 +- .../router/config/RouterFactoryBeanTests.java | 6 +- .../router/config/RouterParserTests.java | 15 +- .../router/config/RouterWithMappingTests.java | 6 +- .../config/SpelRouterIntegrationTests.java | 6 +- .../config/SplitterAggregatorTests.java | 6 +- .../router/config/SplitterParserTests.java | 6 +- .../routingslip/RoutingSlipTests.java | 9 +- .../config/ScatterGatherParserTests.java | 6 +- .../config/ScatterGatherTests.java | 6 +- .../selector/MessageSelectorChainTests.java | 6 +- .../selector/MetadataStoreSelectorTests.java | 6 +- .../splitter/DefaultSplitterTests.java | 13 +- ...micExpressionSplitterIntegrationTests.java | 6 +- .../splitter/MethodInvokingSplitterTests.java | 8 +- .../SpelSplitterIntegrationTests.java | 6 +- .../splitter/SplitterIntegrationTests.java | 6 +- .../splitter/StreamingSplitterTests.java | 8 +- .../store/MessageGroupQueueTests.java | 10 +- .../store/MessageStoreReaperTests.java | 6 +- .../integration/store/MessageStoreTests.java | 11 +- .../store/SimpleMessageGroupTests.java | 10 +- .../store/SimpleMessageStoreTests.java | 11 +- .../support/MessageBuilderTests.java | 6 +- .../support/MessageScenariosTests.java | 6 +- .../support/MutableMessageTests.java | 6 +- .../support/SingleScenarioTests.java | 20 +- .../SmartLifecycleRoleControllerTests.java | 12 +- .../converter/MapMessageConverterTests.java | 16 +- ...EmbeddedJsonHeadersMessageMapperTests.java | 11 +- .../LockRegistryLeaderInitiatorTests.java | 22 +- .../locks/DefaultLockRegistryTests.java | 6 +- .../IntegrationManagementConfigurerTests.java | 10 +- .../MicrometerCustomMetricsTests.java | 13 +- .../micrometer/MicrometerMetricsTests.java | 16 +- .../IntegrationObservabilityZipkinTests.java | 18 +- .../MutableMessageBuilderFactoryTests.java | 6 +- .../TransactionInterceptorBuilderTests.java | 6 +- .../transformer/AvroTestClass1.java | 529 +++++++++--------- .../transformer/AvroTestClass2.java | 529 +++++++++--------- .../integration/transformer/AvroTests.java | 10 +- .../ClaimCheckTransformerTests.java | 6 +- .../transformer/CodecTransformerTests.java | 8 +- .../transformer/ContentEnricherTests.java | 14 +- ...ressionHeaderEnricherIntegrationTests.java | 6 +- ...ExpressionTransformerIntegrationTests.java | 6 +- .../transformer/HeaderFilterTests.java | 10 +- .../MapToObjectTransformerTests.java | 6 +- .../MessageHistoryParameterTests.java | 6 +- .../MethodInvokingTransformerTests.java | 14 +- .../ObjectToMapTransformerTests.java | 15 +- .../ObjectToStringTransformerTests.java | 6 +- .../PayloadDeserializingTransformerTests.java | 10 +- .../PayloadSerializingTransformerTests.java | 6 +- .../transformer/PayloadTransformerTests.java | 6 +- ...PayloadTypeConvertingTransformerTests.java | 6 +- .../SpelHeaderEnricherIntegrationTests.java | 6 +- .../SpelTransformerIntegrationTests.java | 8 +- .../transformer/SysLogTransformerTests.java | 24 +- .../transformer/TransformerContextTests.java | 4 +- .../util/BeanFactoryTypeConverterTests.java | 16 +- .../util/CallerBlocksPolicyTests.java | 6 +- .../integration/util/SimplePoolTests.java | 10 +- .../integration/util/UUIDConverterTests.java | 8 +- ...licationEventListeningMessageProducer.java | 3 +- ...EventInboundChannelAdapterParserTests.java | 4 +- ...ventOutboundChannelAdapterParserTests.java | 4 +- .../event/dsl/IntegrationFlowEventsTests.java | 4 +- ...ionEventListeningMessageProducerTests.java | 6 +- ...ionEventPublishingMessageHandlerTests.java | 4 +- .../feed/dsl/FeedEntryMessageSourceSpec.java | 6 +- .../feed/inbound/FeedEntryMessageSource.java | 10 +- .../FeedInboundChannelAdapterParserTests.java | 13 +- .../integration/feed/dsl/FeedDslTests.java | 5 +- .../inbound/FeedEntryMessageSourceTests.java | 9 +- .../file/FileReadingMessageSource.java | 4 +- .../file/FileWritingMessageHandler.java | 36 +- .../file/config/FileParserUtils.java | 4 +- ...ngMessageHandlerBeanDefinitionBuilder.java | 4 +- .../integration/file/dsl/TailAdapterSpec.java | 4 +- .../filters/LastModifiedFileListFilter.java | 3 +- .../file/remote/RemoteFileOperations.java | 3 +- .../AbstractRemoteFileOutboundGateway.java | 16 +- .../file/AutoCreateDirectoryTests.java | 10 +- .../file/DefaultFileNameGeneratorTests.java | 8 +- .../file/FileInboundTransactionTests.java | 10 +- ...utboundChannelAdapterInsideChainTests.java | 6 +- ...utboundChannelAdapterIntegrationTests.java | 8 +- .../FileOutboundGatewayIntegrationTests.java | 6 +- ...eReadingMessageSourceIntegrationTests.java | 6 +- ...ourcePersistentFilterIntegrationTests.java | 6 +- .../file/FileReadingMessageSourceTests.java | 32 +- .../file/FileToChannelIntegrationTests.java | 6 +- .../file/FileWritingMessageHandlerTests.java | 34 +- .../PatternMatchingFileListFilterTests.java | 14 +- .../file/RecursiveDirectoryScannerTests.java | 6 +- .../WatchServiceDirectoryScannerTests.java | 8 +- .../file/aggregator/FileAggregatorTests.java | 4 +- .../AutoCreateDirectoryIntegrationTests.java | 6 +- .../file/config/ChainElementsTests.java | 12 +- .../config/DefaultConfigurationTests.java | 6 +- .../FileInboundChannelAdapterParserTests.java | 6 +- ...AdapterWithClasspathInPropertiesTests.java | 6 +- ...dChannelAdapterWithPatternParserTests.java | 6 +- ...AdapterWithPreventDuplicatesFlagTests.java | 12 +- ...boundChannelAdapterWithQueueSizeTests.java | 6 +- ...nelAdapterWithRegexPatternParserTests.java | 6 +- .../FileListFilterFactoryBeanTests.java | 6 +- .../file/config/FileMessageHistoryTests.java | 6 +- ...daptersWithClasspathInPropertiesTests.java | 6 +- ...FileOutboundChannelAdapterParserTests.java | 8 +- ...ndChannelAdapterParserWithErrorsTests.java | 8 +- .../FileOutboundGatewayParserTests.java | 8 +- .../file/config/FileSplitterParserTests.java | 6 +- ...eTailInboundChannelAdapterParserTests.java | 8 +- .../FileToStringTransformerParserTests.java | 6 +- .../InboundAdapterWithLockersTests.java | 6 +- .../integration/file/dsl/FileTests.java | 8 +- ...tMarkerFilePresentFileListFilterTests.java | 16 +- .../AcceptOnceFileListFilterTests.java | 8 +- .../ChainFileListFilterIntegrationTests.java | 8 +- .../filters/CompositeFileListFilterTests.java | 26 +- ...mMarkerFilePresentFileListFilterTests.java | 10 +- .../LastModifiedFileListFilterTests.java | 10 +- ...tOnceFileListFilterExternalStoreTests.java | 14 +- ...rsistentAcceptOnceFileListFilterTests.java | 20 +- .../SimplePatternFileListFilterTests.java | 6 +- .../file/locking/FileChannelCacheTests.java | 6 +- .../locking/FileLockingNamespaceTests.java | 6 +- ...ngWithMultipleSourcesIntegrationTests.java | 6 +- .../file/locking/NioFileLockerTests.java | 6 +- ...RemoteFileStreamingMessageSourceTests.java | 20 +- .../file/remote/RemoteFileTemplateTests.java | 22 +- .../file/remote/StreamingInboundTests.java | 26 +- .../RemoteFileOutboundGatewayTests.java | 51 +- .../FileTransferringMessageHandlerTests.java | 26 +- .../session/CachingSessionFactoryTests.java | 12 +- .../DelegatingSessionFactoryTests.java | 14 +- .../AbstractRemoteFileSynchronizerTests.java | 12 +- .../file/splitter/FileSplitterTests.java | 12 +- .../tail/FileTailingMessageProducerTests.java | 10 +- .../integration/file/tail/TailRule.java | 6 +- .../AbstractFilePayloadTransformerTests.java | 6 +- .../FileToByteArrayTransformerTests.java | 6 +- .../FileToStringTransformerTests.java | 6 +- .../ftp/dsl/FtpInboundChannelAdapterSpec.java | 4 +- ...FtpStreamingInboundChannelAdapterSpec.java | 4 +- .../ftp/outbound/FtpMessageHandler.java | 2 +- .../session/DefaultFtpsSessionFactory.java | 20 +- .../ftp/FtpMessageHistoryTests.java | 6 +- .../ftp/FtpParserInboundTests.java | 9 +- .../integration/ftp/FtpTestSupport.java | 4 +- .../FtpInboundChannelAdapterParserTests.java | 10 +- .../FtpInboundOutboundSanitySample.java | 8 +- .../FtpOutboundChannelAdapterParserTests.java | 8 +- .../config/FtpOutboundGatewayParserTests.java | 6 +- ...amingInboundChannelAdapterParserTests.java | 10 +- .../FtpsInboundChannelAdapterParserTests.java | 6 +- ...FtpsOutboundChannelAdapterParserTests.java | 6 +- .../integration/ftp/dsl/FtpTests.java | 30 +- .../ftp/filters/FtpFileListFilterTests.java | 7 +- ...rsistentAcceptOnceFileListFilterTests.java | 6 +- ...oundRemoteFileSystemSynchronizerTests.java | 16 +- .../ftp/inbound/FtpMessageSourceTests.java | 6 +- .../FtpStreamingMessageSourceTests.java | 4 +- .../ftp/inbound/RotatingServersTests.java | 36 +- .../ftp/outbound/BigMGetTests.java | 6 +- .../ftp/outbound/FtpOutboundTests.java | 16 +- .../ftp/outbound/FtpServerOutboundTests.java | 18 +- .../session/FtpRemoteFileTemplateTests.java | 14 +- .../ftp/session/SessionFactoryTests.java | 22 +- .../outbound/GraphQlMessageHandlerTests.java | 11 +- ...rwriteGroovyObjectCustomizerDecorator.java | 6 +- .../groovy/GroovyCommandMessageProcessor.java | 8 +- ...GroovyScriptExecutingMessageProcessor.java | 17 +- ...indingGroovyObjectCustomizerDecorator.java | 8 +- .../config/GroovyControlBusFactoryBean.java | 14 +- .../GroovyControlBusIntegrationTests.java | 6 +- ...yScriptExecutingMessageProcessorTests.java | 7 +- ...ovyScriptPayloadMessageProcessorTests.java | 11 +- .../integration/groovy/RepeatProcessor.java | 6 +- .../groovy/ScriptsFactoryTests.java | 6 +- .../groovy/config/GroovyControlBusTests.java | 11 +- .../groovy/config/GroovyFilterTests.java | 6 +- .../config/GroovyHeaderEnricherTests.java | 6 +- .../groovy/config/GroovyRefreshTests.java | 10 +- .../groovy/config/GroovyRouterTests.java | 6 +- .../config/GroovyServiceActivatorTests.java | 11 +- .../groovy/config/GroovySplitterTests.java | 4 +- .../groovy/config/GroovyTransformerTests.java | 6 +- .../RefreshableResourceScriptSourceTests.java | 6 +- .../config/ServiceActivatorParserTests.java | 8 +- ...zelcastIntegrationDefinitionValidator.java | 8 +- .../HazelcastLocalInstanceRegistrar.java | 9 +- .../AbstractHazelcastMessageProducer.java | 20 +- ...azelcastClusterMonitorMessageProducer.java | 14 +- ...zelcastContinuousQueryMessageProducer.java | 8 +- .../HazelcastDistributedSQLMessageSource.java | 8 +- .../HazelcastEventDrivenMessageProducer.java | 12 +- .../hazelcast/leader/LeaderInitiator.java | 7 +- .../listener/HazelcastMembershipListener.java | 6 +- .../hazelcast/lock/HazelcastLockRegistry.java | 6 +- .../metadata/HazelcastMetadataStore.java | 10 +- .../HazelcastCacheWritingMessageHandler.java | 10 +- .../store/HazelcastMessageStore.java | 6 +- ...stIntegrationDefinitionValidatorTests.java | 11 +- .../IdempotentReceiverIntegrationTests.java | 15 +- ...tributedMapInboundChannelAdapterTests.java | 9 +- ...sterMonitorInboundChannelAdapterTests.java | 12 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...tributedSQLInboundChannelAdapterTests.java | 5 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...EventDrivenInboundChannelAdapterTests.java | 5 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...EventDrivenInboundChannelAdapterTests.java | 9 +- ...edMapInboundChannelAdapterConfigTests.java | 3 +- ...nitorInboundChannelAdapterConfigTests.java | 3 +- ...edSQLInboundChannelAdapterConfigTests.java | 3 +- ...rivenInboundChannelAdapterConfigTests.java | 15 +- ...stIntegrationInboundTestConfiguration.java | 22 +- ...zelcastInboundChannelAdapterTestUtils.java | 18 +- .../leader/LeaderInitiatorTests.java | 15 +- .../lock/HazelcastLockRegistryTests.java | 11 +- .../metadata/HazelcastMetadataStoreTests.java | 15 +- .../HazelcastOutboundChannelAdapterTests.java | 71 ++- ...tIntegrationOutboundTestConfiguration.java | 16 +- ...castOutboundChannelAdapterConfigTests.java | 11 +- ...elcastOutboundChannelAdapterTestUtils.java | 18 +- .../store/HazelcastMessageStoreTests.java | 9 +- .../EnableIntegrationGraphController.java | 4 +- .../config/HttpInboundEndpointParser.java | 4 +- .../integration/http/inbound/CrossOrigin.java | 10 +- .../HttpRequestHandlingController.java | 4 +- .../HttpRequestHandlingEndpointSupport.java | 4 +- .../http/inbound/RequestMapping.java | 10 +- .../IntegrationGraphController.java | 4 +- .../http/support/DefaultHttpHeaderMapper.java | 6 +- .../http/HttpProxyScenarioTests.java | 6 +- .../http/config/ChainElementsTests.java | 10 +- .../config/DefaultConfigurationTests.java | 6 +- .../HttpInboundChannelAdapterParserTests.java | 13 +- .../config/HttpInboundGatewayParserTests.java | 9 +- ...HttpOutboundChannelAdapterParserTests.java | 8 +- .../HttpOutboundGatewayParserTests.java | 8 +- ...boundGatewayWithMethodExpressionTests.java | 12 +- .../config/OutboundResponseTypeTests.java | 14 +- .../integration/http/dsl/HttpDslTests.java | 18 +- .../http/inbound/CrossOriginTests.java | 38 +- .../HttpRequestHandlingControllerTests.java | 10 +- ...pRequestHandlingMessagingGatewayTests.java | 16 +- ...gMessagingGatewayWithPathMappingTests.java | 8 +- ...Int2312RequestMappingIntegrationTests.java | 9 +- .../inbound/MultipartAsRawByteArrayTests.java | 11 +- .../IntegrationGraphControllerTests.java | 20 +- .../http/outbound/CookieTests.java | 4 +- ...tpRequestExecutingMessageHandlerTests.java | 25 +- .../outbound/UriVariableExpressionTests.java | 10 +- ...tpHeaderMapperFromMessageInboundTests.java | 8 +- ...pHeaderMapperFromMessageOutboundTests.java | 14 +- ...ternetProtocolReceivingChannelAdapter.java | 12 +- ...InternetProtocolSendingMessageHandler.java | 3 +- .../integration/ip/CommonSocketOptions.java | 4 +- .../integration/ip/IpHeaders.java | 5 +- .../TcpConnectionFactoryFactoryBean.java | 12 +- .../ip/config/TcpConnectionFactoryParser.java | 3 +- .../TcpOutboundChannelAdapterParser.java | 3 +- .../UdpInboundChannelAdapterParser.java | 6 +- .../ip/dsl/AbstractConnectionFactorySpec.java | 4 +- .../ip/tcp/connection/ConnectionFactory.java | 3 +- .../TcpConnectionFailedCorrelationEvent.java | 3 +- .../connection/TcpConnectionFailedEvent.java | 3 +- .../TcpNetClientConnectionFactory.java | 4 +- .../tcp/connection/TcpNioSSLConnection.java | 4 +- .../ip/tcp/serializer/TcpCodecs.java | 18 +- .../udp/UnicastReceivingChannelAdapter.java | 3 +- .../ip/udp/UnicastSendingMessageHandler.java | 3 +- .../ip/config/ParserUnitTests.java | 8 +- .../TcpConnectionFactoryFactoryBeanTest.java | 9 +- .../ip/dsl/ConnectionFacforyTests.java | 9 +- .../ip/dsl/IpIntegrationTests.java | 7 +- .../tcp/AbstractTcpChannelAdapterTests.java | 5 +- .../integration/ip/tcp/AutoStartTests.java | 6 +- .../ip/tcp/ClientModeControlBusTests.java | 8 +- .../ip/tcp/ConnectionToConnectionTests.java | 6 +- .../tcp/InterceptedSharedConnectionTests.java | 6 +- .../ip/tcp/SharedConnectionTests.java | 6 +- .../ip/tcp/TcpConfigInboundGatewayTests.java | 6 +- .../ip/tcp/TcpConfigOutboundGatewayTests.java | 70 +-- .../ip/tcp/TcpInboundGatewayTests.java | 8 +- .../ip/tcp/TcpOutboundGatewayTests.java | 23 +- .../tcp/TcpReceivingChannelAdapterTests.java | 9 +- .../ip/tcp/TcpSendingMessageHandlerTests.java | 14 +- .../ip/tcp/TcpSendingNoSocketTests.java | 8 +- .../CachingClientConnectionFactoryTests.java | 30 +- .../tcp/connection/ConnectionEventTests.java | 22 +- .../ConnectionFactoryShutDownTests.java | 6 +- .../connection/ConnectionFactoryTests.java | 31 +- .../connection/ConnectionTimeoutTests.java | 8 +- .../FailoverClientConnectionFactoryTests.java | 53 +- .../HelloWorldInterceptorFactory.java | 3 +- .../ip/tcp/connection/PushbackTcpTests.java | 8 +- .../ip/tcp/connection/SOLingerTests.java | 12 +- .../ip/tcp/connection/SocketSupportTests.java | 22 +- .../TcpConnectionEventListenerTests.java | 10 +- .../tcp/connection/TcpMessageMapperTests.java | 10 +- .../TcpNetConnectionSupportTests.java | 10 +- .../tcp/connection/TcpNetConnectionTests.java | 32 +- .../connection/TcpNioConnectionReadTests.java | 6 +- .../tcp/connection/TcpNioConnectionTests.java | 26 +- .../TcpNioConnectionWriteTests.java | 6 +- .../ip/tcp/connection/TcpSenderTests.java | 4 +- ...dAffinityClientConnectionFactoryTests.java | 9 +- .../tcp/serializer/DeserializationTests.java | 20 +- .../LengthHeaderSerializationTests.java | 9 +- .../serializer/MapJsonSerializerTests.java | 6 +- .../PooledDeserializationTests.java | 8 +- .../ip/tcp/serializer/SerializationTests.java | 6 +- .../ip/tcp/serializer/TcpCodecsTests.java | 6 +- .../udp/DatagramPacketMessageMapperTests.java | 6 +- ...ramPacketMulticastSendingHandlerTests.java | 8 +- .../DatagramPacketSendingHandlerTests.java | 10 +- .../integration/ip/udp/MultiClientTests.java | 12 +- .../ip/udp/UdpChannelAdapterTests.java | 8 +- .../ip/udp/UdpMulticastEndToEndTests.java | 10 +- .../ip/udp/UdpUnicastEndToEndTests.java | 10 +- .../integration/ip/util/RegexUtilsTests.java | 6 +- .../integration/ip/util/SocketTestUtils.java | 4 +- .../jdbc/StoredProcOutboundGateway.java | 3 +- .../jdbc/config/JdbcNamespaceHandler.java | 6 +- .../jdbc/store/JdbcChannelMessageStore.java | 8 +- .../jdbc/store/JdbcMessageStore.java | 2 +- ...DerbyChannelMessageStoreQueryProvider.java | 6 +- .../H2ChannelMessageStoreQueryProvider.java | 6 +- .../HsqlChannelMessageStoreQueryProvider.java | 6 +- ...MySqlChannelMessageStoreQueryProvider.java | 6 +- ...racleChannelMessageStoreQueryProvider.java | 6 +- ...tgresChannelMessageStoreQueryProvider.java | 6 +- ...erverChannelMessageStoreQueryProvider.java | 6 +- .../jdbc/AggregatorIntegrationTests.java | 6 +- ...ayerHandlerRescheduleIntegrationTests.java | 6 +- ...luatingSqlParameterSourceFactoryTests.java | 8 +- .../JdbcMessageHandlerIntegrationTests.java | 6 +- .../jdbc/JdbcOutboundGatewayTests.java | 10 +- ...PollingChannelAdapterIntegrationTests.java | 8 +- .../jdbc/MessageGroupQueueTests.java | 6 +- .../jdbc/StoredProcExecutorTests.java | 12 +- .../jdbc/StoredProcJavaConfigTests.java | 4 +- ...ocMessageHandlerDerbyIntegrationTests.java | 8 +- ...utboundChannelAdapterWithinChainTests.java | 6 +- ...dGatewayWithNamespaceIntegrationTests.java | 6 +- ...tboundGatewayWithSpelIntegrationTests.java | 8 +- ...ewayWithSpringContextIntegrationTests.java | 6 +- ...AdapterWithNamespace2IntegrationTests.java | 6 +- ...lAdapterWithNamespaceIntegrationTests.java | 4 +- ...pterWithSpringContextIntegrationTests.java | 4 +- ...resChannelMessageTableSubscriberTests.java | 4 +- .../jdbc/config/InnerPollerParserTests.java | 140 ++--- .../config/JdbcMessageHandlerParserTests.java | 4 +- .../config/JdbcMessageStoreParserTests.java | 6 +- .../JdbcOutboundGatewayParserTests.java | 10 +- .../JdbcPollingChannelAdapterParserTests.java | 6 +- .../jdbc/config/JdbcTypesEnumTests.java | 8 +- .../config/StoredProcInvalidConfigsTests.java | 8 +- .../StoredProcMessageHandlerParserTests.java | 14 +- .../StoredProcOutboundGatewayParserTests.java | 6 +- ...dProcPollingChannelAdapterParserTests.java | 10 +- .../JdbcLockRegistryLeaderInitiatorTests.java | 4 +- .../jdbc/lock/DefaultLockRepositoryTests.java | 12 +- .../lock/JdbcLockRegistryDelegateTests.java | 14 +- .../JdbcLockRegistryDifferentClientTests.java | 4 +- .../jdbc/lock/JdbcLockRegistryTests.java | 14 +- .../jdbc/metadata/JdbcMetadataStoreTests.java | 6 +- ...lJdbcMessageStoreMultipleChannelTests.java | 7 +- .../mysql/MySqlJdbcMessageStoreTests.java | 4 +- ...bcMessageStoreChannelIntegrationTests.java | 8 +- ...StoreChannelOnePollerIntegrationTests.java | 8 +- .../store/JdbcMessageStoreChannelTests.java | 8 +- .../store/JdbcMessageStoreRegionTests.java | 8 +- .../jdbc/store/JdbcMessageStoreTests.java | 4 +- .../AbstractJdbcChannelMessageStoreTests.java | 6 +- .../AbstractTxTimeoutMessageStoreTests.java | 6 +- .../jdbc/store/channel/TestService.java | 3 +- .../storedproc/ProcedureParameterTests.java | 8 +- .../integration/jdbc/storedproc/User.java | 4 +- .../jms/DefaultJmsHeaderMapper.java | 1 - .../integration/jms/JmsInboundGateway.java | 3 +- .../integration/jms/JmsOutboundGateway.java | 1 - .../jms/SubscribableJmsChannel.java | 1 - .../jms/config/JmsChannelParser.java | 3 +- .../JmsMessageDrivenEndpointParser.java | 4 +- .../jms/config/JmsOutboundGatewayParser.java | 6 +- .../jms/config/JmsParserUtils.java | 6 +- ...nnelPublishingJmsMessageListenerTests.java | 19 +- .../jms/DefaultJmsHeaderMapperTests.java | 8 +- .../jms/JmsInboundChannelAdapterTests.java | 6 +- .../jms/JmsOutboundChannelAdapterTests.java | 5 +- .../jms/JmsOutboundGatewayTests.java | 19 +- .../jms/JmsOutboundInsideChainTests.java | 6 +- .../jms/OutboundGatewayConnectionTests.java | 11 +- .../jms/OutboundGatewayFunctionTests.java | 11 +- .../jms/PollableJmsChannelTests.java | 15 +- .../jms/SplitterAggregatorTests.java | 6 +- .../jms/SubscribableJmsChannelTests.java | 19 +- .../jms/config/DefaultConfigurationTests.java | 6 +- .../ExceptionHandlingSiConsumerTests.java | 7 +- .../ExtractRequestReplyPayloadTests.java | 9 +- .../config/GlobalChannelInterceptorTests.java | 6 +- .../jms/config/InboundOneWayErrorTests.java | 7 +- .../jms/config/JmsChannelHistoryTests.java | 14 +- .../jms/config/JmsChannelParserTests.java | 7 +- .../config/JmsDynamicDestinationTests.java | 7 +- .../jms/config/JmsHeaderEnricherTests.java | 7 +- .../JmsInboundChannelAdapterParserTests.java | 6 +- .../config/JmsInboundGatewayParserTests.java | 9 +- ...essageDrivenChannelAdapterParserTests.java | 8 +- .../config/JmsMessageDrivenEndpointTests.java | 11 +- .../jms/config/JmsMessageHistoryTests.java | 6 +- .../JmsOutboundChannelAdapterParserTests.java | 7 +- .../config/JmsOutboundGatewayParserTests.java | 9 +- .../jms/config/JmsPriorityTests.java | 7 +- ...sWithMarshallingMessageConverterTests.java | 6 +- .../integration/jms/dsl/JmsTests.java | 6 +- .../jms/request_reply/AsyncGatewayTests.java | 7 +- .../GatewaySerializedReplyChannelTests.java | 6 +- .../jms/request_reply/MiscellaneousTests.java | 10 +- .../jms/request_reply/PipelineJmsTests.java | 6 +- .../PipelineNamedReplyQueuesJmsTests.java | 6 +- ...eplyScenariosWithCachedConsumersTests.java | 29 +- ...nariosWithCorrelationKeyProvidedTests.java | 6 +- ...yScenariosWithNonCachedConsumersTests.java | 25 +- ...eplyScenariosWithTempReplyQueuesTests.java | 21 +- .../jms/request_reply/StopStartTests.java | 6 +- .../jmx/config/MBeanExporterHelper.java | 4 +- .../monitor/IntegrationMBeanExporter.java | 2 +- .../AttributePollingMessageSourceTests.java | 6 +- .../jmx/MBeanAttributeFilterTests.java | 6 +- .../MBeanTreePollingMessageSourceTests.java | 6 +- ...ficationListeningMessageProducerTests.java | 8 +- ...ficationPublishingMessageHandlerTests.java | 8 +- .../OperationInvokingMessageHandlerTests.java | 10 +- ...eActivatorDefaultFrameworkMethodTests.java | 6 +- .../integration/jmx/UpdateMappingsTests.java | 10 +- ...ibutePollingChannelAdapterParserTests.java | 6 +- .../jmx/config/ControlBusParserTests.java | 6 +- .../jmx/config/CustomObjectNameTests.java | 8 +- .../jmx/config/DynamicRouterTests.java | 21 +- .../jmx/config/MBeanAutoDetectTests.java | 6 +- .../jmx/config/MBeanExporterParserTests.java | 6 +- .../MBeanRegistrationCustomNamingTests.java | 7 +- .../jmx/config/MBeanRegistrationTests.java | 6 +- ...nTreePollingChannelAdapterParserTests.java | 6 +- .../jmx/config/MessageStoreTests.java | 6 +- .../jmx/config/MethodInvokerTests.java | 6 +- ...ionListeningChannelAdapterParserTests.java | 6 +- ...onPublishingChannelAdapterParserTests.java | 13 +- ...tionInvokingChannelAdapterParserTests.java | 12 +- ...OperationInvokingOutboundGatewayTests.java | 11 +- .../jmx/config/PollingAdapterMBeanTests.java | 6 +- .../jmx/config/PriorityChannelTests.java | 6 +- .../jmx/config/RouterMBeanTests.java | 14 +- .../jmx/config/RouterMBeanVanillaTests.java | 6 +- .../jmx/config/SimpleDynamicRouter.java | 8 +- .../integration/jmx/config/TestPublisher.java | 3 +- .../jmx/configuration/DslMBeanTests.java | 4 +- .../configuration/EnableMBeanExportTests.java | 8 +- ...hainWithMessageProducingHandlersTests.java | 10 +- .../HandlerMonitoringIntegrationTests.java | 6 +- .../MBeanExporterIntegrationTests.java | 8 +- .../monitor/MessageMetricsAdviceTests.java | 4 +- .../monitor/MessageSourceTests.java | 6 +- ...sagingGatewaySupportRegistrationTests.java | 6 +- .../monitor/RemoteMBeanServerTests.java | 7 +- .../ScatterGatherHandlerIntegrationTests.java | 4 +- .../monitor/TransformerContextTests.java | 6 +- .../mbeanexporterhelper/Int2307Tests.java | 6 +- .../xml/AbstractJpaOutboundGatewayParser.java | 4 +- .../jpa/config/xml/JpaNamespaceHandler.java | 4 +- .../RetrievingJpaOutboundGatewayParser.java | 6 +- .../xml/UpdatingJpaOutboundGatewayParser.java | 4 +- .../integration/jpa/core/JpaOperations.java | 6 +- .../integration/jpa/support/JpaParameter.java | 4 +- .../integration/jpa/support/JpaUtils.java | 3 +- .../JpaInboundChannelAdapterParserTests.java | 6 +- .../xml/JpaMessageHandlerParserTests.java | 12 +- .../xml/JpaOutboundGatewayParserTests.java | 12 +- .../jpa/core/AbstractJpaOperationsTests.java | 10 +- .../jpa/core/JpaExecutorTests.java | 11 +- .../integration/jpa/dsl/JpaTests.java | 5 +- .../JpaPollingChannelAdapterTests.java | 9 +- .../JpaPollingChannelAdapterUnitTests.java | 10 +- .../JpaOutboundChannelAdapterTests.java | 9 +- ...boundChannelAdapterTransactionalTests.java | 6 +- .../JpaOutboundGatewayIntegrationTests.java | 7 +- .../jpa/outbound/JpaOutboundGatewayTests.java | 8 +- ...EvaluatingParameterSourceFactoryTests.java | 6 +- .../integration/jpa/test/JpaTestUtils.java | 12 +- .../integration/jpa/test/entity/Gender.java | 5 +- .../jpa/test/entity/StudentDomain.java | 8 +- .../kafka/channel/AbstractKafkaChannel.java | 6 +- .../KafkaOutboundChannelAdapterParser.java | 4 +- .../kafka/dsl/KafkaOutboundGatewaySpec.java | 4 +- .../outbound/KafkaProducerMessageHandler.java | 2 +- .../kafka/channnel/ChannelTests.java | 4 +- .../kafka/config/xml/AllXmlTests.java | 4 +- .../kafka/config/xml/ChannelParserTests.java | 6 +- ...KafkaInboundChannelAdapterParserTests.java | 18 +- .../config/xml/KafkaInboundGatewayTests.java | 12 +- ...essageDrivenChannelAdapterParserTests.java | 6 +- .../xml/KafkaOutboundAdapterParserTests.java | 10 +- .../xml/KafkaOutboundGatewayParserTests.java | 14 +- .../integration/kafka/dsl/KafkaDslTests.java | 4 +- .../kafka/inbound/InboundGatewayTests.java | 14 +- .../inbound/MessageDrivenAdapterTests.java | 28 +- .../MessageSourceIntegrationTests.java | 4 +- .../kafka/inbound/MessageSourceTests.java | 61 +- .../KafkaProducerMessageHandlerTests.java | 54 +- .../mail/ImapIdleChannelAdapter.java | 1 - .../integration/mail/ImapMailReceiver.java | 5 +- .../integration/mail/MailHeaders.java | 3 +- .../integration/mail/MailTransportUtils.java | 3 +- .../mail/dsl/ImapIdleChannelAdapterSpec.java | 1 - .../mail/ImapMailReceiverTests.java | 67 ++- .../mail/ImapMailSearchTermsTests.java | 11 +- .../integration/mail/MailReceiverTests.java | 23 +- .../mail/MailReceivingMessageSourceTests.java | 13 +- ...MailSendingMessageHandlerContextTests.java | 11 +- .../mail/MailSendingMessageHandlerTests.java | 11 +- .../integration/mail/MailTestsHelper.java | 8 +- .../mail/Pop3MailReceiverTests.java | 34 +- .../config/DefaultConfigurationTests.java | 6 +- .../config/FailedMailConfigurationTests.java | 6 +- .../ImapIdleChannelAdapterParserTests.java | 7 +- .../mail/config/ImapIdleIntegrationTests.java | 21 +- .../InboundChannelAdapterParserTests.java | 7 +- .../mail/config/MailHeaderEnricherTests.java | 6 +- ...MailOutboundChannelAdapterParserTests.java | 6 +- .../MailToStringTransformerParserTests.java | 9 +- .../config/MessageWithContentTypeTests.java | 17 +- .../config/PollingMailSourceParserTests.java | 7 +- .../integration/mail/config/Pop3Tests.java | 16 +- .../integration/mail/config/SmtpTests.java | 14 +- .../integration/mail/dsl/MailTests.java | 16 +- .../MongoDbOutboundChannelAdapterParser.java | 3 +- .../config/MongoDbOutboundGatewayParser.java | 4 +- .../inbound/AbstractMongoDbMessageSource.java | 5 +- .../MongoDbChangeStreamMessageProducer.java | 5 +- .../mongodb/inbound/MongoDbMessageSource.java | 3 +- .../inbound/ReactiveMongoDbMessageSource.java | 7 +- .../outbound/MessageCollectionCallback.java | 7 +- .../MongoDbStoringMessageHandler.java | 5 +- .../ReactiveMongoDbStoringMessageHandler.java | 6 +- ...stractConfigurableMongoDbMessageStore.java | 8 +- .../mongodb/store/MongoDbMessageStore.java | 9 +- .../mongodb/MongoDbContainerTest.java | 11 +- ...InboundChannelAdapterIntegrationTests.java | 7 +- ...ngoDbInboundChannelAdapterParserTests.java | 8 +- ...utboundChannelAdapterIntegrationTests.java | 5 +- ...goDbOutboundChannelAdapterParserTests.java | 8 +- .../MongoDbOutboundGatewayParserTests.java | 8 +- .../integration/mongodb/dsl/MongoDbTests.java | 8 +- ...ngoDbChangeStreamMessageProducerTests.java | 29 +- .../inbound/MongoDbMessageSourceTests.java | 15 +- .../ReactiveMongoDbMessageSourceTests.java | 21 +- .../metadata/MongoDbMetadataStoreTests.java | 4 +- .../outbound/MongoDbOutboundGatewayTests.java | 8 +- .../MongoDbOutboundGatewayXmlTests.java | 4 +- .../MongoDbStoringMessageHandlerTests.java | 14 +- ...tiveMongoDbStoringMessageHandlerTests.java | 13 +- ...AbstractMongoDbMessageGroupStoreTests.java | 4 +- .../AbstractMongoDbMessageStoreTests.java | 4 +- ...igurableMongoDbMessageGroupStoreTests.java | 4 +- ...ayerHandlerRescheduleIntegrationTests.java | 4 +- ...essageStoreClaimCheckIntegrationTests.java | 4 +- .../store/MongoDbMessageStoreTests.java | 4 +- .../mqtt/config/xml/MqttNamespaceHandler.java | 4 +- .../mqtt/core/Mqttv3ClientManager.java | 2 +- .../mqtt/core/Mqttv5ClientManager.java | 2 +- .../mqtt/event/MqttMessageDeliveredEvent.java | 3 +- .../MqttPahoMessageDrivenChannelAdapter.java | 2 +- ...Mqttv5PahoMessageDrivenChannelAdapter.java | 2 +- .../mqtt/outbound/MqttPahoMessageHandler.java | 2 +- .../outbound/Mqttv5PahoMessageHandler.java | 2 +- .../mqtt/support/MqttHeaderMapper.java | 4 +- .../mqtt/BackToBackAdapterTests.java | 14 +- .../mqtt/ClientManagerBackToBackTests.java | 8 +- .../mqtt/DownstreamExceptionTests.java | 16 +- .../integration/mqtt/MqttAdapterTests.java | 54 +- .../integration/mqtt/MqttDslTests.java | 6 +- ...ttv5BackToBackAutomaticReconnectTests.java | 8 +- .../mqtt/Mqttv5BackToBackTests.java | 4 +- ...essageDrivenChannelAdapterParserTests.java | 4 +- ...MqttOutboundChannelAdapterParserTests.java | 6 +- .../r2dbc/inbound/R2dbcMessageSource.java | 11 +- .../r2dbc/outbound/R2dbcMessageHandler.java | 4 +- .../config/R2dbcDatabaseConfiguration.java | 10 +- .../integration/r2dbc/dsl/R2dbcDslTests.java | 15 +- .../integration/r2dbc/entity/Person.java | 11 +- .../inbound/R2dbcMessageSourceTests.java | 13 +- .../outbound/R2dbcMessageHandlerTests.java | 9 +- .../channel/SubscribableRedisChannel.java | 2 +- .../config/RedisOutboundGatewayParser.java | 6 +- .../ReactiveRedisStreamMessageProducer.java | 7 +- .../ReactiveRedisStreamMessageHandler.java | 8 +- .../redis/outbound/RedisOutboundGateway.java | 4 +- .../RedisChannelPriorityMessageStore.java | 3 +- .../integration/redis/RedisContainerTest.java | 7 +- .../SubscribableRedisChannelTests.java | 8 +- .../redis/config/RedisChannelParserTests.java | 4 +- ...RedisInboundChannelAdapterParserTests.java | 4 +- ...edisOutboundChannelAdapterParserTests.java | 4 +- .../RedisQueueGatewayIntegrationTests.java | 4 +- ...QueueInboundChannelAdapterParserTests.java | 4 +- .../RedisQueueInboundGatewayParserTests.java | 6 +- ...ueueOutboundChannelAdapterParserTests.java | 6 +- .../RedisQueueOutboundGatewayParserTests.java | 6 +- ...StoreInboundChannelAdapterParserTests.java | 6 +- ...toreOutboundChannelAdapterParserTests.java | 6 +- ...activeRedisStreamMessageProducerTests.java | 11 +- .../RedisInboundChannelAdapterTests.java | 6 +- .../RedisQueueMessageDrivenEndpointTests.java | 10 +- ...InboundChannelAdapterIntegrationTests.java | 4 +- ...RedisLockRegistryLeaderInitiatorTests.java | 4 +- .../metadata/RedisMetadataStoreTests.java | 6 +- ...eactiveRedisStreamMessageHandlerTests.java | 4 +- .../outbound/RedisOutboundGatewayTests.java | 6 +- .../RedisPublishingMessageHandlerTests.java | 4 +- ...RedisQueueOutboundChannelAdapterTests.java | 4 +- ...utboundChannelAdapterIntegrationTests.java | 6 +- .../RedisStoreWritingMessageHandlerTests.java | 10 +- ...ayerHandlerRescheduleIntegrationTests.java | 6 +- .../store/RedisChannelMessageStoreTests.java | 5 +- .../store/RedisMessageGroupStoreTests.java | 9 +- .../redis/store/RedisMessageStoreTests.java | 6 +- .../util/AggregatorWithRedisLocksTests.java | 4 +- .../redis/util/CustomJsonSerializer.java | 14 +- .../redis/util/RedisLockRegistryTests.java | 6 +- .../rsocket/ClientRSocketConnector.java | 11 +- .../IntegrationRSocketMessageHandler.java | 15 +- .../rsocket/ServerRSocketConnector.java | 20 +- .../rsocket/ServerRSocketMessageHandler.java | 4 +- .../inbound/RSocketInboundGateway.java | 7 +- .../outbound/RSocketOutboundGateway.java | 7 +- .../RSocketInboundGatewayParserTests.java | 6 +- .../RSocketOutboundGatewayParserTests.java | 6 +- .../rsocket/dsl/RSocketDslTests.java | 7 +- ...RSocketInboundGatewayIntegrationTests.java | 21 +- ...SocketOutboundGatewayIntegrationTests.java | 63 +-- .../jsr223/ScriptExecutorFactory.java | 2 +- .../jsr223/Int3164Jsr223RefreshTests.java | 6 +- .../config/jsr223/Jsr223FilterTests.java | 6 +- .../jsr223/Jsr223HeaderEnricherTests.java | 4 +- .../Jsr223InboundChannelAdapterTests.java | 4 +- .../config/jsr223/Jsr223RefreshTests.java | 7 +- .../config/jsr223/Jsr223RouterTests.java | 6 +- .../jsr223/Jsr223ServiceActivatorTests.java | 8 +- .../config/jsr223/Jsr223SplitterTests.java | 6 +- .../config/jsr223/Jsr223TransformerTests.java | 4 +- .../scripting/dsl/ScriptsTests.java | 5 +- .../DeriveLanguageFromExtensionTests.java | 8 +- ...3ScriptExecutingMessageProcessorTests.java | 6 +- .../jsr223/Jsr223ScriptExecutorTests.java | 8 +- .../jsr223/PythonScriptExecutorTests.java | 6 +- .../jsr223/PythonVariableParserTests.java | 6 +- ...hannelAdapterSecurityIntegrationTests.java | 6 +- .../ChannelSecurityInterceptorTests.java | 4 +- .../ChannelSecurityAnnotationTests.java | 8 +- .../session/DefaultSftpSessionFactory.java | 2 +- .../integration/sftp/session/SftpSession.java | 1 - ...boundChannelAdapterParserCachingTests.java | 4 +- .../InboundChannelAdapterParserTests.java | 6 +- ...boundChannelAdapterParserCachingTests.java | 6 +- .../OutboundChannelAdapterParserTests.java | 6 +- .../SftpOutboundGatewayParserTests.java | 6 +- ...amingInboundChannelAdapterParserTests.java | 10 +- .../integration/sftp/dsl/SftpTests.java | 4 +- .../sftp/filters/SftpFileListFilterTests.java | 4 +- ...rsistentAcceptOnceFileListFilterTests.java | 8 +- .../inbound/RollbackLocalFilterTests.java | 4 +- ...oundRemoteFileSystemSynchronizerTests.java | 16 +- .../sftp/inbound/SftpMessageSourceTests.java | 6 +- .../SftpStreamingMessageSourceTests.java | 4 +- .../sftp/outbound/BigMGetTests.java | 6 +- .../sftp/outbound/SftpOutboundTests.java | 26 +- .../outbound/SftpServerOutboundTests.java | 20 +- ...ourceKnownHostsServerKeyVerifierTests.java | 6 +- .../session/SftpRemoteFileTemplateTests.java | 8 +- .../sftp/session/SftpServerTests.java | 4 +- .../sftp/session/SftpSessionFactoryTests.java | 6 +- .../sftp/session/SftpTestSessionFactory.java | 4 +- .../integration/smb/dsl/Smb.java | 4 +- .../smb/dsl/SmbInboundChannelAdapterSpec.java | 6 +- .../smb/dsl/SmbMessageHandlerSpec.java | 4 +- .../smb/dsl/SmbOutboundGatewaySpec.java | 4 +- ...SmbStreamingInboundChannelAdapterSpec.java | 6 +- ...SmbPersistentAcceptOnceFileListFilter.java | 4 +- .../SmbRegexPatternFileListFilter.java | 4 +- .../SmbSimplePatternFileListFilter.java | 4 +- ...SystemMarkerFilePresentFileListFilter.java | 4 +- .../inbound/SmbInboundFileSynchronizer.java | 4 +- ...InboundFileSynchronizingMessageSource.java | 4 +- .../inbound/SmbStreamingMessageSource.java | 5 +- .../smb/outbound/SmbMessageHandler.java | 4 +- .../smb/outbound/SmbOutboundGateway.java | 5 +- .../integration/smb/session/SmbConfig.java | 4 +- .../integration/smb/session/SmbFileInfo.java | 7 +- .../smb/session/SmbRemoteFileTemplate.java | 4 +- .../integration/smb/session/SmbSession.java | 8 +- .../smb/session/SmbSessionFactory.java | 5 +- .../integration/smb/session/SmbShare.java | 11 +- .../integration/smb/AbstractBaseTests.java | 4 +- .../smb/SmbMessageHistoryTests.java | 4 +- .../integration/smb/SmbTestSupport.java | 5 +- .../SmbInboundChannelAdapterParserTests.java | 8 +- .../smb/config/SmbInboundOutboundSample.java | 7 +- .../SmbOutboundChannelAdapterParserTests.java | 4 +- .../config/SmbOutboundGatewayParserTests.java | 4 +- ...amingInboundChannelAdapterParserTests.java | 8 +- .../integration/smb/dsl/SmbTests.java | 9 +- ...oundRemoteFileSystemSynchronizerTests.java | 11 +- .../SmbSendingMessageHandlerTests.java | 11 +- ...SmbSessionFactoryWithCIFSContextTests.java | 17 +- .../smb/session/SmbSessionTests.java | 5 +- .../stomp/AbstractStompSessionManager.java | 3 +- .../stomp/support/package-info.java | 1 - .../stomp/StompSessionManagerTests.java | 6 +- .../client/StompServerIntegrationTests.java | 6 +- .../config/StompAdaptersParserTests.java | 8 +- ...annelAdapterWebSocketIntegrationTests.java | 6 +- ...ssageHandlerWebSocketIntegrationTests.java | 4 +- .../stream/ByteStreamSourceTests.java | 8 +- .../ByteStreamWritingMessageHandlerTests.java | 54 +- .../stream/CharacterStreamSourceTests.java | 10 +- ...acterStreamWritingMessageHandlerTests.java | 6 +- ...nsoleInboundChannelAdapterParserTests.java | 6 +- ...soleOutboundChannelAdapterParserTests.java | 12 +- .../config/DefaultConfigurationTests.java | 6 +- .../syslog/RFC5424MessageConverter.java | 6 +- .../syslog/RFC5424SyslogParser.java | 3 +- ...logReceivingChannelAdapterParserTests.java | 6 +- .../inbound/SyslogDeserializerTests.java | 11 +- .../SyslogReceivingChannelAdapterTests.java | 18 +- .../integration/test/condition/LogLevels.java | 4 +- .../test/condition/LongRunningTest.java | 4 +- .../test/matcher/MapContentMatchers.java | 4 +- .../test/rule/Log4j2LevelAdjuster.java | 4 +- .../AbstractRequestResponseScenarioTests.java | 6 +- .../support/LongRunningIntegrationTest.java | 4 +- .../matcher/MockitoMessageMatchersTests.java | 12 +- .../test/context/MockIntegrationContext.java | 6 +- .../test/context/SpringIntegrationTest.java | 2 +- ...dSpringIntegrationTestAnnotationTests.java | 4 +- .../test/mock/MockMessageHandlerTests.java | 24 +- .../test/mock/MockMessageSourceTests.java | 8 +- .../IntegrationHandlerResultHandler.java | 6 +- .../inbound/WebFluxInboundEndpoint.java | 7 +- ...WebFluxRequestExecutingMessageHandler.java | 7 +- ...bFluxInboundChannelAdapterParserTests.java | 8 +- .../WebFluxInboundGatewayParserTests.java | 8 +- ...FluxOutboundChannelAdapterParserTests.java | 6 +- .../WebFluxOutboundGatewayParserTests.java | 6 +- .../webflux/dsl/WebFluxDslTests.java | 17 +- .../inbound/WebFluxInboundEndpointTests.java | 9 +- ...uxRequestExecutingMessageHandlerTests.java | 9 +- .../IntegrationWebSocketContainer.java | 6 +- .../config/WebSocketAdapterParsingUtils.java | 4 +- .../ClientWebSocketContainerTests.java | 6 +- .../client/StompIntegrationTests.java | 6 +- .../client/WebSocketClientTests.java | 6 +- .../config/WebSocketParserTests.java | 8 +- .../websocket/dsl/WebSocketDslTests.java | 9 +- .../WebSocketInboundChannelAdapterTests.java | 6 +- .../WebSocketOutboundMessageHandlerTests.java | 6 +- .../server/WebSocketServerTests.java | 12 +- .../SubProtocolHandlerRegistryTests.java | 14 +- .../ws/dsl/BaseWsInboundGatewaySpec.java | 4 +- .../dsl/MarshallingWsInboundGatewaySpec.java | 4 +- .../ws/dsl/SimpleWsInboundGatewaySpec.java | 4 +- .../ws/DefaultSoapHeaderMapperTests.java | 11 +- ...MarshallingWebServiceIntegrationTests.java | 8 +- .../SimpleWebServiceInboundGatewayTests.java | 20 +- .../SimpleWebServiceOutboundGatewayTests.java | 9 +- ...bServiceInboundGatewayJavaConfigTests.java | 16 +- .../ws/config/DefaultConfigurationTests.java | 6 +- .../ws/config/StubMessageFactory.java | 8 +- .../ws/config/UriVariableTests.java | 13 +- .../config/WebServiceHeaderEnricherTests.java | 6 +- .../WebServiceInboundGatewayParserTests.java | 10 +- .../WebServiceOutboundGatewayParserTests.java | 18 +- ...eOutboundGatewayWithHeaderMapperTests.java | 32 +- .../integration/ws/dsl/WsDslTests.java | 20 +- .../config/XsltPayloadTransformerParser.java | 4 +- .../xml/transformer/XPathHeaderEnricher.java | 3 +- ...EvaluatingHeaderValueMessageProcessor.java | 4 +- .../integration/xml/xpath/XPathUtils.java | 4 +- .../xml/DefaultXmlPayloadConverterTests.java | 8 +- .../xml/config/ChainElementsTests.java | 8 +- .../xml/config/DefaultConfigurationTests.java | 6 +- .../MarshallingTransformerParserTests.java | 8 +- .../xml/config/TestXmlApplicationContext.java | 4 +- .../UnmarshallingTransformerParserTests.java | 8 +- .../config/XPathExpressionParserTests.java | 9 +- .../xml/config/XPathFilterParserTests.java | 6 +- .../XPathHeaderEnricherParserTests.java | 6 +- .../XPathMessageSplitterParserTests.java | 6 +- .../xml/config/XPathRouterParserTests.java | 8 +- .../xml/config/XPathSplitterParserTests.java | 6 +- .../config/XPathTransformerParserTests.java | 6 +- ...XmlPayloadValidatingFilterParserTests.java | 8 +- .../XsltPayloadTransformerParserTests.java | 6 +- .../xml/router/XPathRouterTests.java | 16 +- .../BooleanTestXpathMessageSelectorTests.java | 6 +- ...ingValueTestXPathMessageSelectorTests.java | 6 +- .../XmlValidatingMessageSelectorTests.java | 8 +- .../xml/source/DomSourceFactoryTests.java | 8 +- .../xml/source/StringSourceTests.java | 8 +- .../splitter/XPathMessageSplitterTests.java | 6 +- .../transformer/CustomTestResultFactory.java | 3 +- .../MarshallingTransformerTests.java | 6 +- .../ResultToDocumentTransformerTests.java | 6 +- .../ResultToStringTransformerTests.java | 8 +- .../UnmarshallingTransformerTests.java | 6 +- .../transformer/XPathHeaderEnricherTests.java | 6 +- .../transformer/XPathTransformerTests.java | 6 +- .../XsltPayloadTransformerTests.java | 10 +- .../xml/transformer/XsltTransformerTests.java | 6 +- .../jaxbmarshaling/JaxbAnnotatedPerson.java | 5 +- .../JaxbMarshallingIntegrationTests.java | 8 +- .../integration/xml/xpath/XPathTests.java | 8 +- .../inbound/ChatMessageListeningEndpoint.java | 5 +- ...ssageInboundChannelAdapterParserTests.java | 6 +- ...sageOutboundChannelAdapterParserTests.java | 10 +- ...senceInboundChannelAdapterParserTests.java | 4 +- ...enceOutboundChannelAdapterParserTests.java | 4 +- .../XmppConnectionFactoryBeanTests.java | 8 +- .../config/XmppConnectionParserTests.java | 4 +- .../config/XmppHeaderEnricherParserTests.java | 12 +- .../ChatMessageListeningEndpointTests.java | 20 +- .../PresenceListeningEndpointTests.java | 8 +- ...ChatMessageSendingMessageHandlerTests.java | 20 +- .../PresenceSendingMessageHandlerTests.java | 10 +- .../support/DefaultXmppHeaderMapperTests.java | 4 +- .../zeromq/channel/ZeroMqChannel.java | 49 +- .../zeromq/inbound/ZeroMqMessageProducer.java | 14 +- .../zeromq/outbound/ZeroMqMessageHandler.java | 14 +- .../zeromq/channel/ZeroMqChannelTests.java | 12 +- .../zeromq/dsl/ZeroMqDslTests.java | 6 +- .../inbound/ZeroMqMessageProducerTests.java | 13 +- .../outbound/ZeroMqMessageHandlerTests.java | 9 +- .../config/xml/ZookeeperNamespaceHandler.java | 4 +- .../CuratorFrameworkFactoryBeanTests.java | 6 +- .../LeaderInitiatorFactoryBeanTests.java | 6 +- .../config/xml/ZookeeperParserTests.java | 6 +- .../zookeeper/event/ZookeeperLeaderTests.java | 8 +- .../zookeeper/lock/ZkLockRegistryTests.java | 8 +- .../metadata/ZookeeperMetadataStoreTests.java | 10 +- src/checkstyle/checkstyle.xml | 4 +- src/eclipse/org.eclipse.core.resources.prefs | 2 + src/eclipse/org.eclipse.jdt.core.prefs | 469 ++++++++++++++++ src/eclipse/org.eclipse.jdt.ui.prefs | 66 +++ src/idea/spring-framework.xml | 263 +++++++++ 1385 files changed, 7627 insertions(+), 6931 deletions(-) create mode 100644 src/eclipse/org.eclipse.core.resources.prefs create mode 100644 src/eclipse/org.eclipse.jdt.core.prefs create mode 100644 src/eclipse/org.eclipse.jdt.ui.prefs create mode 100644 src/idea/spring-framework.xml diff --git a/.github/release-files-spec.json b/.github/release-files-spec.json index 4ceba9f6d9..be01238433 100644 --- a/.github/release-files-spec.json +++ b/.github/release-files-spec.json @@ -7,15 +7,21 @@ { "@build.name": "${buildname}", "@build.number": "${buildnumber}", - "path": {"$match": "org*"} + "path": { + "$match": "org*" + } }, { "$or": [ { - "name": {"$match": "*.pom"} + "name": { + "$match": "*.pom" + } }, { - "name": {"$match": "*.jar"} + "name": { + "$match": "*.jar" + } } ] } diff --git a/.github/workflows/central-sync-close.yml b/.github/workflows/central-sync-close.yml index a00aebd4d4..a877231e09 100644 --- a/.github/workflows/central-sync-close.yml +++ b/.github/workflows/central-sync-close.yml @@ -12,12 +12,12 @@ jobs: runs-on: ubuntu-latest steps: - # Request close promotion repo - - uses: jvalkeal/nexus-sync@v0 - with: - url: ${{ secrets.OSSRH_URL }} - username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} - staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} - close: true + # Request close promotion repo + - uses: jvalkeal/nexus-sync@v0 + with: + url: ${{ secrets.OSSRH_URL }} + username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} + password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} + staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} + staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} + close: true diff --git a/.github/workflows/central-sync-create.yml b/.github/workflows/central-sync-create.yml index 57f831f9a8..12e74a9b54 100644 --- a/.github/workflows/central-sync-create.yml +++ b/.github/workflows/central-sync-create.yml @@ -15,44 +15,44 @@ jobs: runs-on: ubuntu-latest steps: - # to get spec file in .github - - uses: actions/checkout@v2 + # to get spec file in .github + - uses: actions/checkout@v2 - # Setup jfrog cli - - uses: jfrog/setup-jfrog-cli@v1 - with: - version: 1.46.4 - env: - JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} + # Setup jfrog cli + - uses: jfrog/setup-jfrog-cli@v1 + with: + version: 1.46.4 + env: + JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }} - # Extract build id from input - - name: Extract Build Id - run: | - echo JFROG_CLI_BUILD_NAME="${{ github.event.inputs.buildName }}" >> $GITHUB_ENV - echo JFROG_CLI_BUILD_NUMBER=${{ github.event.inputs.buildNumber }} >> $GITHUB_ENV + # Extract build id from input + - name: Extract Build Id + run: | + echo JFROG_CLI_BUILD_NAME="${{ github.event.inputs.buildName }}" >> $GITHUB_ENV + echo JFROG_CLI_BUILD_NUMBER=${{ github.event.inputs.buildNumber }} >> $GITHUB_ENV - # Download released files - - name: Download Release Files - run: | - jfrog rt download \ - --spec .github/release-files-spec.json \ - --spec-vars "buildname=$JFROG_CLI_BUILD_NAME;buildnumber=$JFROG_CLI_BUILD_NUMBER" + # Download released files + - name: Download Release Files + run: | + jfrog rt download \ + --spec .github/release-files-spec.json \ + --spec-vars "buildname=$JFROG_CLI_BUILD_NAME;buildnumber=$JFROG_CLI_BUILD_NUMBER" - # Create checksums, signatures and create staging repo on central and upload - - uses: jvalkeal/nexus-sync@v0 - id: nexus - with: - url: ${{ secrets.OSSRH_URL }} - username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} - create: true - upload: true - generate-checksums: true - pgp-sign: true - pgp-sign-passphrase: ${{ secrets.GPG_PASSPHRASE }} - pgp-sign-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + # Create checksums, signatures and create staging repo on central and upload + - uses: jvalkeal/nexus-sync@v0 + id: nexus + with: + url: ${{ secrets.OSSRH_URL }} + username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} + password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} + staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} + create: true + upload: true + generate-checksums: true + pgp-sign: true + pgp-sign-passphrase: ${{ secrets.GPG_PASSPHRASE }} + pgp-sign-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - # Print staging repo id - - name: Print Staging Repo Id - run: echo ${{ steps.nexus.outputs.staged-repository-id }} + # Print staging repo id + - name: Print Staging Repo Id + run: echo ${{ steps.nexus.outputs.staged-repository-id }} diff --git a/.github/workflows/central-sync-release.yml b/.github/workflows/central-sync-release.yml index abf2cb92f2..18960cdcdb 100644 --- a/.github/workflows/central-sync-release.yml +++ b/.github/workflows/central-sync-release.yml @@ -12,12 +12,12 @@ jobs: runs-on: ubuntu-latest steps: - # Request release promotion repo - - uses: jvalkeal/nexus-sync@v0 - with: - url: ${{ secrets.OSSRH_URL }} - username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} - staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} - release: true + # Request release promotion repo + - uses: jvalkeal/nexus-sync@v0 + with: + url: ${{ secrets.OSSRH_URL }} + username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} + password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} + staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }} + staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }} + release: true diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java index 033bb9c36d..113d6caf0a 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,29 +47,29 @@ import org.springframework.util.StringUtils; abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefinitionParser { private static final String[] CONTAINER_VALUE_ATTRIBUTES = { - "acknowledge-mode", - "channel-transacted", - "concurrent-consumers", - "consumers-per-queue", - "expose-listener-channel", - "phase", - "prefetch-count", - "queue-names", - "recovery-interval", - "receive-timeout", - "shutdown-timeout", - "tx-size", - "missing-queues-fatal" + "acknowledge-mode", + "channel-transacted", + "concurrent-consumers", + "consumers-per-queue", + "expose-listener-channel", + "phase", + "prefetch-count", + "queue-names", + "recovery-interval", + "receive-timeout", + "shutdown-timeout", + "tx-size", + "missing-queues-fatal" }; private static final String[] CONTAINER_REFERENCE_ATTRIBUTES = { - "advice-chain", - "connection-factory", - "error-handler", - "message-properties-converter", - "task-executor", - "transaction-attribute", - "transaction-manager" + "advice-chain", + "connection-factory", + "error-handler", + "message-properties-converter", + "task-executor", + "transaction-attribute", + "transaction-manager" }; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java index ab118c07a7..280f881b3a 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.messaging.MessageChannel; * @since 5.0 */ public abstract class - AmqpBaseOutboundEndpointSpec, E extends AbstractAmqpOutboundEndpoint> +AmqpBaseOutboundEndpointSpec, E extends AbstractAmqpOutboundEndpoint> extends MessageHandlerSpec { protected final DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.outboundMapper(); // NOSONAR final diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java index c3042ad6c2..094c2f010f 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java @@ -36,7 +36,7 @@ import org.springframework.integration.dsl.ComponentsRegistration; * @since 5.0 */ public abstract class AmqpInboundChannelAdapterSpec - , C extends MessageListenerContainer> + , C extends MessageListenerContainer> extends AmqpBaseInboundChannelAdapterSpec implements ComponentsRegistration { diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java index a306970541..52e611a9da 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.springframework.integration.dsl.ComponentsRegistration; * @since 5.0 */ public abstract class AmqpInboundGatewaySpec - , C extends AbstractMessageListenerContainer> + , C extends AbstractMessageListenerContainer> extends AmqpBaseInboundGatewaySpec implements ComponentsRegistration { diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStream.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStream.java index dd0c760738..338427c11b 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStream.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStream.java @@ -16,12 +16,12 @@ package org.springframework.integration.amqp.dsl; -import org.springframework.rabbit.stream.listener.StreamListenerContainer; -import org.springframework.rabbit.stream.producer.RabbitStreamTemplate; - import com.rabbitmq.stream.Codec; import com.rabbitmq.stream.Environment; +import org.springframework.rabbit.stream.listener.StreamListenerContainer; +import org.springframework.rabbit.stream.producer.RabbitStreamTemplate; + /** * Factory class for RabbitMQ components. * diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamInboundChannelAdapterSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamInboundChannelAdapterSpec.java index 09c9f54a23..18f4106fe5 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamInboundChannelAdapterSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamInboundChannelAdapterSpec.java @@ -18,12 +18,12 @@ package org.springframework.integration.amqp.dsl; import java.util.function.Consumer; -import org.springframework.lang.Nullable; -import org.springframework.rabbit.stream.listener.StreamListenerContainer; - import com.rabbitmq.stream.Codec; import com.rabbitmq.stream.Environment; +import org.springframework.lang.Nullable; +import org.springframework.rabbit.stream.listener.StreamListenerContainer; + /** * Spec for an inbound channel adapter with a {@link StreamListenerContainer}. * diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamMessageListenerContainerSpec.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamMessageListenerContainerSpec.java index ca2b2002ab..06e44b11c5 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamMessageListenerContainerSpec.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamMessageListenerContainerSpec.java @@ -18,6 +18,8 @@ package org.springframework.integration.amqp.dsl; import java.util.function.Consumer; +import com.rabbitmq.stream.Codec; +import com.rabbitmq.stream.Environment; import org.aopalliance.aop.Advice; import org.springframework.lang.Nullable; @@ -25,9 +27,6 @@ import org.springframework.rabbit.stream.listener.ConsumerCustomizer; import org.springframework.rabbit.stream.listener.StreamListenerContainer; import org.springframework.rabbit.stream.support.converter.StreamMessageConverter; -import com.rabbitmq.stream.Codec; -import com.rabbitmq.stream.Environment; - /** * Spec for {@link StreamListenerContainer}. * diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java index 8ba884b673..65258abf9e 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import com.rabbitmq.client.Channel; + import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.batch.BatchingStrategy; @@ -54,8 +56,6 @@ import org.springframework.retry.support.RetrySynchronizationManager; import org.springframework.retry.support.RetryTemplate; import org.springframework.util.Assert; -import com.rabbitmq.client.Channel; - /** * Adapter that receives Messages from an AMQP Queue, converts them into * Spring Integration Messages, and sends the results to a Message Channel. @@ -349,7 +349,7 @@ public class AmqpInboundChannelAdapter extends MessageProducerSupport implements AmqpInboundChannelAdapter.this.abstractListenerContainer == null ? false : AcknowledgeMode.MANUAL == AmqpInboundChannelAdapter.this.abstractListenerContainer - .getAcknowledgeMode(); + .getAcknowledgeMode(); protected final RetryOperations retryOps = AmqpInboundChannelAdapter.this.retryTemplate; // NOSONAR diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java index b478ab4376..a8ba8f96e4 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import com.rabbitmq.client.Channel; + import org.springframework.amqp.core.AcknowledgeMode; import org.springframework.amqp.core.Address; import org.springframework.amqp.core.AmqpTemplate; @@ -51,8 +53,6 @@ import org.springframework.retry.support.RetrySynchronizationManager; import org.springframework.retry.support.RetryTemplate; import org.springframework.util.Assert; -import com.rabbitmq.client.Channel; - /** * Adapter that receives Messages from an AMQP Queue, converts them into * Spring Integration Messages, and sends the results to a Message Channel. @@ -102,6 +102,7 @@ public class AmqpInboundGateway extends MessagingGatewaySupport { } // TODO Remove in 6.0 + /** * Construct {@link AmqpInboundGateway} based on the provided {@link AbstractMessageListenerContainer} * to receive request messages and {@link AmqpTemplate} to send replies. @@ -290,14 +291,14 @@ public class AmqpInboundGateway extends MessagingGatewaySupport { Assert.state(this.recoveryCallback == null || this.messageRecoverer == null, "Only one of 'recoveryCallback' or 'messageRecoverer' may be provided, but not both"); if (this.messageRecoverer != null) { - this.recoveryCallback = - context -> { - Message messageToRecover = - (Message) RetrySynchronizationManager.getContext() - .getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE); - this.messageRecoverer.recover(messageToRecover, context.getLastThrowable()); - return null; - }; + this.recoveryCallback = + context -> { + Message messageToRecover = + (Message) RetrySynchronizationManager.getContext() + .getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE); + this.messageRecoverer.recover(messageToRecover, context.getLastThrowable()); + return null; + }; } } diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java index d2ee4f62e6..f84bb575c0 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.GetResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,9 +48,6 @@ import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.integration.support.AbstractIntegrationMessageBuilder; import org.springframework.util.Assert; -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.GetResponse; - /** * A pollable {@link org.springframework.integration.core.MessageSource} for RabbitMQ. * @@ -277,17 +276,17 @@ public class AmqpMessageSource extends AbstractMessageSource { try { long deliveryTag = this.ackInfo.getGetResponse().getEnvelope().getDeliveryTag(); switch (status) { - case ACCEPT: - this.ackInfo.getChannel().basicAck(deliveryTag, false); - break; - case REJECT: - this.ackInfo.getChannel().basicReject(deliveryTag, false); - break; - case REQUEUE: - this.ackInfo.getChannel().basicReject(deliveryTag, true); - break; - default: - break; + case ACCEPT: + this.ackInfo.getChannel().basicAck(deliveryTag, false); + break; + case REJECT: + this.ackInfo.getChannel().basicReject(deliveryTag, false); + break; + case REQUEUE: + this.ackInfo.getChannel().basicReject(deliveryTag, true); + break; + default: + break; } if (this.ackInfo.isTransacted()) { this.ackInfo.getChannel().txCommit(); diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java index 425cb34409..b941c08b0e 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,9 +115,9 @@ public class AmqpOutboundEndpoint extends AbstractAmqpOutboundEndpoint */ public void setMultiSend(boolean multiSend) { Assert.isTrue(this.rabbitTemplate != null - && (!this.waitForConfirm || this.rabbitTemplate.getConnectionFactory().isSimplePublisherConfirms()), + && (!this.waitForConfirm || this.rabbitTemplate.getConnectionFactory().isSimplePublisherConfirms()), () -> "To use multiSend, " + AmqpOutboundEndpoint.this.amqpTemplate - + " must be a RabbitTemplate with a ConnectionFactory configured with simple confirms"); + + " must be a RabbitTemplate with a ConnectionFactory configured with simple confirms"); this.multiSend = multiSend; } diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdvice.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdvice.java index 8cd42a0703..f56a1721f1 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdvice.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ package org.springframework.integration.amqp.support; import java.lang.reflect.UndeclaredThrowableException; import java.time.Duration; +import com.rabbitmq.client.ConfirmCallback; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,8 +30,6 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; -import com.rabbitmq.client.ConfirmCallback; - /** * An advice that causes all downstream {@link RabbitOperations} operations to be executed * on the same channel, as long as there are no thread handoffs, since the channel is diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java index f1909c5459..d1c8d4945f 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -218,7 +218,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpMessage.getMessageProperties(); - assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); - assertThat(properties.getHeaders().get("foobar")).isEqualTo("foobar"); - assertThat(properties.getHeaders().get("bar")).isNull(); - assertThat(properties.getDeliveryMode()).isEqualTo(shouldBePersistent.get() ? - MessageDeliveryMode.PERSISTENT - : MessageDeliveryMode.NON_PERSISTENT); - return null; - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpMessage.getMessageProperties(); + assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); + assertThat(properties.getHeaders().get("foobar")).isEqualTo("foobar"); + assertThat(properties.getHeaders().get("bar")).isNull(); + assertThat(properties.getDeliveryMode()).isEqualTo(shouldBePersistent.get() ? + MessageDeliveryMode.PERSISTENT + : MessageDeliveryMode.NON_PERSISTENT); + return null; + }) .when(amqpTemplate).send(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), Mockito.any(CorrelationData.class)); + Mockito.any(org.springframework.amqp.core.Message.class), Mockito.any(CorrelationData.class)); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); MessageChannel requestChannel = context.getBean("requestChannel", MessageChannel.class); @@ -209,16 +208,16 @@ public class AmqpOutboundChannelAdapterParserTests { amqpTemplate = Mockito.spy(amqpTemplate); Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpMessage.getMessageProperties(); - assertThat(new String(amqpMessage.getBody())).isEqualTo("hello"); - assertThat(properties.getDeliveryMode()).isEqualTo(MessageDeliveryMode.PERSISTENT); - return null; - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpMessage.getMessageProperties(); + assertThat(new String(amqpMessage.getBody())).isEqualTo("hello"); + assertThat(properties.getDeliveryMode()).isEqualTo(MessageDeliveryMode.PERSISTENT); + return null; + }) .when(amqpTemplate).send(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), - Mockito.any(CorrelationData.class)); + Mockito.any(org.springframework.amqp.core.Message.class), + Mockito.any(CorrelationData.class)); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); MessageChannel requestChannel = context.getBean("amqpOutboundChannelAdapterWithinChain", MessageChannel.class); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java index 4bcbc84b14..14117efdd0 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.amqp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.isNull; - import java.lang.reflect.Field; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -48,6 +45,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.isNull; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -64,7 +64,7 @@ public class AmqpOutboundGatewayParserTests { private static volatile int adviceCalled; @Autowired - private ApplicationContext context; + private ApplicationContext context; @Test public void testGatewayConfig() { @@ -116,22 +116,22 @@ public class AmqpOutboundGatewayParserTests { final AtomicBoolean shouldBePersistent = new AtomicBoolean(); Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpRequestMessage.getMessageProperties(); - assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); - assertThat(properties.getDeliveryMode()).isEqualTo(shouldBePersistent.get() ? - MessageDeliveryMode.PERSISTENT - : MessageDeliveryMode.NON_PERSISTENT); - // mock reply AMQP message - MessageProperties amqpProperties = new MessageProperties(); - amqpProperties.setAppId("test.appId"); - amqpProperties.setHeader("foobar", "foobar"); - amqpProperties.setHeader("bar", "bar"); - return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpRequestMessage.getMessageProperties(); + assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); + assertThat(properties.getDeliveryMode()).isEqualTo(shouldBePersistent.get() ? + MessageDeliveryMode.PERSISTENT + : MessageDeliveryMode.NON_PERSISTENT); + // mock reply AMQP message + MessageProperties amqpProperties = new MessageProperties(); + amqpProperties.setAppId("test.appId"); + amqpProperties.setHeader("foobar", "foobar"); + amqpProperties.setHeader("bar", "bar"); + return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); + }) .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), isNull()); + Mockito.any(org.springframework.amqp.core.Message.class), isNull()); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); MessageChannel requestChannel = this.context.getBean("toRabbit1", MessageChannel.class); @@ -178,21 +178,21 @@ public class AmqpOutboundGatewayParserTests { amqpTemplate = Mockito.spy(amqpTemplate); Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpRequestMessage.getMessageProperties(); - assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); - // mock reply AMQP message - MessageProperties amqpProperties = new MessageProperties(); - amqpProperties.setAppId("test.appId"); - amqpProperties.setHeader("foobar", "foobar"); - amqpProperties.setHeader("bar", "bar"); - assertThat(properties.getDeliveryMode()).isEqualTo(MessageDeliveryMode.PERSISTENT); - amqpProperties.setReceivedDeliveryMode(properties.getDeliveryMode()); - return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpRequestMessage.getMessageProperties(); + assertThat(properties.getHeaders().get("foo")).isEqualTo("foo"); + // mock reply AMQP message + MessageProperties amqpProperties = new MessageProperties(); + amqpProperties.setAppId("test.appId"); + amqpProperties.setHeader("foobar", "foobar"); + amqpProperties.setHeader("bar", "bar"); + assertThat(properties.getDeliveryMode()).isEqualTo(MessageDeliveryMode.PERSISTENT); + amqpProperties.setReceivedDeliveryMode(properties.getDeliveryMode()); + return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); + }) .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), isNull()); + Mockito.any(org.springframework.amqp.core.Message.class), isNull()); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); MessageChannel requestChannel = this.context.getBean("toRabbit2", MessageChannel.class); @@ -227,19 +227,19 @@ public class AmqpOutboundGatewayParserTests { amqpTemplate = Mockito.spy(amqpTemplate); Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpRequestMessage.getMessageProperties(); - assertThat(properties.getHeaders().get("foo")).isNull(); - // mock reply AMQP message - MessageProperties amqpProperties = new MessageProperties(); - amqpProperties.setAppId("test.appId"); - amqpProperties.setHeader("foobar", "foobar"); - amqpProperties.setHeader("bar", "bar"); - return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpRequestMessage.getMessageProperties(); + assertThat(properties.getHeaders().get("foo")).isNull(); + // mock reply AMQP message + MessageProperties amqpProperties = new MessageProperties(); + amqpProperties.setAppId("test.appId"); + amqpProperties.setHeader("foobar", "foobar"); + amqpProperties.setHeader("bar", "bar"); + return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); + }) .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), isNull()); + Mockito.any(org.springframework.amqp.core.Message.class), isNull()); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); MessageChannel requestChannel = this.context.getBean("toRabbit3", MessageChannel.class); @@ -276,19 +276,19 @@ public class AmqpOutboundGatewayParserTests { amqpTemplate = Mockito.spy(amqpTemplate); Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; - MessageProperties properties = amqpRequestMessage.getMessageProperties(); - assertThat(properties.getHeaders().get("foo")).isNull(); - // mock reply AMQP message - MessageProperties amqpProperties = new MessageProperties(); - amqpProperties.setAppId("test.appId"); - amqpProperties.setHeader("foobar", "foobar"); - amqpProperties.setHeader("bar", "bar"); - return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); - }) + Object[] args = invocation.getArguments(); + org.springframework.amqp.core.Message amqpRequestMessage = (org.springframework.amqp.core.Message) args[2]; + MessageProperties properties = amqpRequestMessage.getMessageProperties(); + assertThat(properties.getHeaders().get("foo")).isNull(); + // mock reply AMQP message + MessageProperties amqpProperties = new MessageProperties(); + amqpProperties.setAppId("test.appId"); + amqpProperties.setHeader("foobar", "foobar"); + amqpProperties.setHeader("bar", "bar"); + return new org.springframework.amqp.core.Message("hello".getBytes(), amqpProperties); + }) .when(amqpTemplate).sendAndReceive(Mockito.any(String.class), Mockito.any(String.class), - Mockito.any(org.springframework.amqp.core.Message.class), isNull()); + Mockito.any(org.springframework.amqp.core.Message.class), isNull()); ReflectionUtils.setField(amqpTemplateField, endpoint, amqpTemplate); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests.java index 6564f44d3d..600fe314aa 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.amqp.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java index 460b991763..03b7c8cd91 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java @@ -16,14 +16,6 @@ package org.springframework.integration.amqp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -46,6 +38,14 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.util.ReflectionTestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Dave Syer diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpTests.java index 5d305e5c57..1a4ca0cf81 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/dsl/AmqpTests.java @@ -16,17 +16,13 @@ package org.springframework.integration.amqp.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import com.rabbitmq.stream.ConsumerBuilder; +import com.rabbitmq.stream.Environment; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -75,8 +71,11 @@ import org.springframework.rabbit.stream.listener.ConsumerCustomizer; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.rabbitmq.stream.ConsumerBuilder; -import com.rabbitmq.stream.Environment; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; /** * @author Artem Bilan @@ -85,9 +84,9 @@ import com.rabbitmq.stream.Environment; * @since 5.0 */ @SpringJUnitConfig -@RabbitAvailable(queues = { "amqpOutboundInput", "amqpReplyChannel", "asyncReplies", +@RabbitAvailable(queues = {"amqpOutboundInput", "amqpReplyChannel", "asyncReplies", "defaultReplyTo", "si.dsl.test", "si.dsl.exception.test.dlq", - "si.dsl.conv.exception.test.dlq", "testTemplateChannelTransacted" }) + "si.dsl.conv.exception.test.dlq", "testTemplateChannelTransacted"}) @DirtiesContext public class AmqpTests { @@ -169,7 +168,7 @@ public class AmqpTests { @Test public void testTemplateChannelTransacted() { IntegrationFlowBuilder flow = IntegrationFlow.from(Amqp.channel("testTemplateChannelTransacted", - this.rabbitConnectionFactory) + this.rabbitConnectionFactory) .autoStartup(false) .templateChannelTransacted(true)); assertThat(TestUtils.getPropertyValue(flow, "currentMessageChannel.amqpTemplate.transactional", @@ -365,10 +364,10 @@ public class AmqpTests { @Bean public IntegrationFlow amqpInboundFlow(ConnectionFactory rabbitConnectionFactory) { return IntegrationFlow.from(Amqp.inboundAdapter(rabbitConnectionFactory, fooQueue()) - .configureContainer(container -> container.consumerBatchEnabled(true) - .batchSize(2)) - .batchMode(BatchMode.EXTRACT_PAYLOADS) - .id("amqpInboundFlowAdapter")) + .configureContainer(container -> container.consumerBatchEnabled(true) + .batchSize(2)) + .batchMode(BatchMode.EXTRACT_PAYLOADS) + .id("amqpInboundFlowAdapter")) .transform(String.class, String::toUpperCase) .channel(Amqp.pollableChannel(rabbitConnectionFactory) .queueName("amqpReplyChannel") @@ -403,8 +402,8 @@ public class AmqpTests { @Bean public IntegrationFlow inboundWithExceptionFlow(ConnectionFactory cf) { return IntegrationFlow.from(Amqp.inboundAdapter(cf, exQueue()) - .configureContainer(c -> c.defaultRequeueRejected(false)) - .errorChannel("errors.input")) + .configureContainer(c -> c.defaultRequeueRejected(false)) + .errorChannel("errors.input")) .handle(m -> { throw new RuntimeException("fail"); }) @@ -440,17 +439,17 @@ public class AmqpTests { @Bean public IntegrationFlow inboundWithConvExceptionFlow(ConnectionFactory cf) { return IntegrationFlow.from(Amqp.inboundAdapter(cf, exConvQueue()) - .configureContainer(c -> c.defaultRequeueRejected(false)) - .messageConverter(new SimpleMessageConverter() { + .configureContainer(c -> c.defaultRequeueRejected(false)) + .messageConverter(new SimpleMessageConverter() { - @Override - public Object fromMessage(org.springframework.amqp.core.Message message) - throws MessageConversionException { - throw new MessageConversionException("fail"); - } + @Override + public Object fromMessage(org.springframework.amqp.core.Message message) + throws MessageConversionException { + throw new MessageConversionException("fail"); + } - }) - .errorChannel("errors.input")) + }) + .errorChannel("errors.input")) .get(); } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java index f58614bcc2..51e19ef14d 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.amqp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -58,6 +56,8 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @@ -70,7 +70,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; AmqpMessageSourceIntegrationTests.DSL_QUEUE, AmqpMessageSourceIntegrationTests.INTERCEPT_QUEUE, AmqpMessageSourceIntegrationTests.DLQ, - AmqpMessageSourceIntegrationTests.NOAUTOACK_QUEUE }) + AmqpMessageSourceIntegrationTests.NOAUTOACK_QUEUE}) public class AmqpMessageSourceIntegrationTests { static final String DSL_QUEUE = "AmqpMessageSourceIntegrationTests"; @@ -182,7 +182,7 @@ public class AmqpMessageSourceIntegrationTests { @ServiceActivator(inputChannel = "noAutoAck") public void ack(@Header(IntegrationMessageHeaderAccessor.ACKNOWLEDGMENT_CALLBACK) - AcknowledgmentCallback callback) { + AcknowledgmentCallback callback) { callback.noAutoAck(); this.callback = callback; latch.countDown(); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java index a63115813d..45a2144ef1 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/AmqpMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,17 +16,15 @@ package org.springframework.integration.amqp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.List; import java.util.concurrent.ExecutorService; +import com.rabbitmq.client.AMQP.BasicProperties; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import com.rabbitmq.client.Envelope; +import com.rabbitmq.client.GetResponse; import org.junit.Test; import org.springframework.amqp.core.MessageProperties; @@ -40,12 +38,13 @@ import org.springframework.integration.acks.AcknowledgmentCallback.Status; import org.springframework.integration.amqp.support.AmqpMessageHeaderErrorMessageStrategy; import org.springframework.messaging.Message; -import com.rabbitmq.client.AMQP.BasicProperties; -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; -import com.rabbitmq.client.ConnectionFactory; -import com.rabbitmq.client.Envelope; -import com.rabbitmq.client.GetResponse; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Gary Russell @@ -76,7 +75,7 @@ public class AmqpMessageSourceTests { assertThat(received.getHeaders().get(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE)) .isInstanceOf(org.springframework.amqp.core.Message.class); assertThat(received.getHeaders().get(IntegrationMessageHeaderAccessor.SOURCE_DATA)) - .isSameAs(received.getHeaders().get(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE)); + .isSameAs(received.getHeaders().get(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE)); assertThat(received.getHeaders().get(AmqpHeaders.CONSUMER_QUEUE)).isEqualTo("foo"); // make sure channel is not cached org.springframework.amqp.rabbit.connection.Connection conn = ccf.createConnection(); @@ -130,7 +129,7 @@ public class AmqpMessageSourceTests { verify(connection).close(30000); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) @Test public void testBatch() throws Exception { SimpleBatchingStrategy bs = new SimpleBatchingStrategy(2, 10_000, 10_000L); @@ -164,5 +163,4 @@ public class AmqpMessageSourceTests { assertThat(((List) received.getPayload())).contains("test1", "test2"); } - } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java index 7ea904edac..2bc2efd394 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/InboundEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,6 @@ package org.springframework.integration.amqp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,6 +24,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import com.rabbitmq.client.Channel; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -80,7 +68,18 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.retry.support.RetryTemplate; -import com.rabbitmq.client.Channel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; /** * @author Artem Bilan @@ -199,19 +198,19 @@ public class InboundEndpointTests { CountDownLatch sendLatch = new CountDownLatch(1); Mockito.doAnswer(invocation -> { - org.springframework.amqp.core.Message message = - invocation.getArgument(2); - Map headers = message.getMessageProperties().getHeaders(); - assertThat(headers.containsKey(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isTrue(); - assertThat(headers.get(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isNotEqualTo("foo"); - assertThat(headers.containsKey(JsonHeaders.CONTENT_TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isFalse(); - assertThat(headers.containsKey(JsonHeaders.KEY_TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isFalse(); - assertThat(headers.containsKey(JsonHeaders.TYPE_ID)).isFalse(); - assertThat(headers.containsKey(JsonHeaders.KEY_TYPE_ID)).isFalse(); - assertThat(headers.containsKey(JsonHeaders.CONTENT_TYPE_ID)).isFalse(); - sendLatch.countDown(); - return null; - }).when(rabbitTemplate) + org.springframework.amqp.core.Message message = + invocation.getArgument(2); + Map headers = message.getMessageProperties().getHeaders(); + assertThat(headers.containsKey(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isTrue(); + assertThat(headers.get(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isNotEqualTo("foo"); + assertThat(headers.containsKey(JsonHeaders.CONTENT_TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isFalse(); + assertThat(headers.containsKey(JsonHeaders.KEY_TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))).isFalse(); + assertThat(headers.containsKey(JsonHeaders.TYPE_ID)).isFalse(); + assertThat(headers.containsKey(JsonHeaders.KEY_TYPE_ID)).isFalse(); + assertThat(headers.containsKey(JsonHeaders.CONTENT_TYPE_ID)).isFalse(); + sendLatch.countDown(); + return null; + }).when(rabbitTemplate) .send(anyString(), anyString(), any(org.springframework.amqp.core.Message.class), isNull()); AmqpInboundGateway gateway = new AmqpInboundGateway(container, rabbitTemplate); @@ -462,7 +461,7 @@ public class InboundEndpointTests { assertThat(recoveredMessage.get()).isSameAs(amqpMessage); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) @Test public void testBatchAdapter() throws Exception { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(mock(ConnectionFactory.class)); @@ -486,7 +485,7 @@ public class InboundEndpointTests { assertThat(((List) received.getPayload())).contains("test1", "test2"); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) @Test public void testBatchGateway() throws Exception { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(mock(ConnectionFactory.class)); @@ -513,7 +512,7 @@ public class InboundEndpointTests { assertThat(sourceData).isSameAs(batched.getMessage()); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) @Test public void testConsumerBatchExtract() { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(mock(ConnectionFactory.class)); @@ -537,7 +536,7 @@ public class InboundEndpointTests { .hasSize(2); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) @Test public void testConsumerBatch() { SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(mock(ConnectionFactory.class)); @@ -566,7 +565,8 @@ public class InboundEndpointTests { container.setConsumerBatchEnabled(true); AmqpInboundChannelAdapter adapter = new AmqpInboundChannelAdapter(container); adapter.setRetryTemplate(new RetryTemplate()); - adapter.setMessageRecoverer((message, cause) -> { }); + adapter.setMessageRecoverer((message, cause) -> { + }); assertThatIllegalArgumentException() .isThrownBy(adapter::afterPropertiesSet) .withMessageStartingWith("The 'messageRecoverer' must be an instance of MessageBatchRecoverer " + @@ -577,7 +577,8 @@ public class InboundEndpointTests { public void testExclusiveRecover() { AmqpInboundChannelAdapter adapter = new AmqpInboundChannelAdapter(mock(AbstractMessageListenerContainer.class)); adapter.setRetryTemplate(new RetryTemplate()); - adapter.setMessageRecoverer((message, cause) -> { }); + adapter.setMessageRecoverer((message, cause) -> { + }); adapter.setRecoveryCallback(context -> null); assertThatIllegalStateException() .isThrownBy(adapter::afterPropertiesSet) diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java index ad64e9695a..c9fd8fb1ad 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/inbound/ManualAckTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,7 @@ package org.springframework.integration.amqp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - +import com.rabbitmq.client.Channel; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -51,7 +49,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.rabbitmq.client.Channel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * @author Gary Russell diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java index 7ee6ab914c..c9acce8632 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests.java @@ -16,15 +16,6 @@ package org.springframework.integration.amqp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -59,6 +50,15 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.willDoNothing; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java index 10d3117a2b..981a7f9ccc 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests2.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.amqp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.Collections; import java.util.concurrent.TimeUnit; @@ -48,6 +45,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java index c3e4eef713..5f4d9c7ebf 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AsyncAmqpGatewayTests.java @@ -16,15 +16,6 @@ package org.springframework.integration.amqp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; @@ -60,6 +51,15 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Gary Russell * @author Artem Bilan @@ -67,7 +67,7 @@ import org.springframework.messaging.support.ErrorMessage; * @since 4.3 * */ -@RabbitAvailable(queues = { "asyncQ1", "asyncRQ1" }) +@RabbitAvailable(queues = {"asyncQ1", "asyncRQ1"}) @LogLevels(categories = "org.springframework.amqp", level = "trace") class AsyncAmqpGatewayTests { @@ -152,7 +152,8 @@ class AsyncAmqpGatewayTests { // timeout tests asyncTemplate.setReceiveTimeout(10); - receiver.setMessageListener(message1 -> { }); + receiver.setMessageListener(message1 -> { + }); // reply timeout with no requiresReply message = MessageBuilder.withPayload("bar").setErrorChannel(errorChannel).build(); gateway.handleMessage(message); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java index bf2800c2ad..3c8c7b982a 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java @@ -16,18 +16,6 @@ package org.springframework.integration.amqp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.util.Date; import java.util.concurrent.atomic.AtomicReference; @@ -53,6 +41,18 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.TaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willDoNothing; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/RabbitStreamMessageHandlerTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/RabbitStreamMessageHandlerTests.java index 711d5eb996..0088383b00 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/RabbitStreamMessageHandlerTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/RabbitStreamMessageHandlerTests.java @@ -16,12 +16,14 @@ package org.springframework.integration.amqp.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import com.rabbitmq.stream.Address; +import com.rabbitmq.stream.Consumer; +import com.rabbitmq.stream.Environment; +import com.rabbitmq.stream.OffsetSpecification; import org.junit.jupiter.api.Test; import org.springframework.integration.amqp.dsl.RabbitStream; @@ -29,10 +31,7 @@ import org.springframework.integration.amqp.support.RabbitTestContainer; import org.springframework.integration.support.MessageBuilder; import org.springframework.rabbit.stream.producer.RabbitStreamTemplate; -import com.rabbitmq.stream.Address; -import com.rabbitmq.stream.Consumer; -import com.rabbitmq.stream.Environment; -import com.rabbitmq.stream.OffsetSpecification; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceIntegrationTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceIntegrationTests.java index 90704b5c86..fb437a52f9 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceIntegrationTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceIntegrationTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.amqp.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.spy; - import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -44,6 +38,12 @@ import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.spy; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceTests.java index c96e3fd4e6..9d90abc730 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/BoundRabbitChannelAdviceTests.java @@ -16,22 +16,12 @@ package org.springframework.integration.amqp.support; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.time.Duration; import java.util.concurrent.ExecutorService; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; @@ -45,9 +35,18 @@ import org.springframework.integration.config.EnableIntegration; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; -import com.rabbitmq.client.ConnectionFactory; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Gary Russell diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java index 50fe29b56f..63b4d95a88 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.amqp.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -44,6 +40,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MimeType; import org.springframework.util.MimeTypeUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/JsonConverterCompatibilityTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/JsonConverterCompatibilityTests.java index 6eed5069d8..f67c115bfb 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/JsonConverterCompatibilityTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/JsonConverterCompatibilityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,7 @@ package org.springframework.integration.amqp.support; -import static org.assertj.core.api.Assertions.assertThat; - +import com.rabbitmq.client.AMQP.BasicProperties; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -33,7 +32,7 @@ import org.springframework.integration.json.ObjectToJsonTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import com.rabbitmq.client.AMQP.BasicProperties; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell @@ -63,8 +62,7 @@ public class JsonConverterCompatibilityTests { @Test public void testInbound() { - @SuppressWarnings("unchecked") - final Message out = (Message) new ObjectToJsonTransformer() + @SuppressWarnings("unchecked") final Message out = (Message) new ObjectToJsonTransformer() .transform(new GenericMessage(new Foo())); MessageProperties messageProperties = new MessageProperties(); DefaultAmqpHeaderMapper.outboundMapper().fromHeadersToRequest(out.getHeaders(), messageProperties); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/MappingUtilsTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/MappingUtilsTests.java index ca0c110c2e..2e5c8a58cf 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/MappingUtilsTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/MappingUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.amqp.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.springframework.amqp.core.MessageDeliveryMode; @@ -29,6 +26,9 @@ import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 5.0 diff --git a/spring-integration-camel/src/main/java/org/springframework/integration/camel/dsl/CamelMessageHandlerSpec.java b/spring-integration-camel/src/main/java/org/springframework/integration/camel/dsl/CamelMessageHandlerSpec.java index e6add10f56..cb2438e153 100644 --- a/spring-integration-camel/src/main/java/org/springframework/integration/camel/dsl/CamelMessageHandlerSpec.java +++ b/spring-integration-camel/src/main/java/org/springframework/integration/camel/dsl/CamelMessageHandlerSpec.java @@ -44,9 +44,9 @@ import org.springframework.util.Assert; public class CamelMessageHandlerSpec extends MessageHandlerSpec { - private String[] inboundHeaderNames = { "*" }; + private String[] inboundHeaderNames = {"*"}; - private String[] outboundHeaderNames = { "*" }; + private String[] outboundHeaderNames = {"*"}; protected CamelMessageHandlerSpec(@Nullable ProducerTemplate producerTemplate) { this.target = producerTemplate == null ? new CamelMessageHandler() : new CamelMessageHandler(producerTemplate); diff --git a/spring-integration-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java b/spring-integration-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java index f1d39b28de..3bceb8da1f 100644 --- a/spring-integration-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java +++ b/spring-integration-camel/src/main/java/org/springframework/integration/camel/support/CamelHeaderMapper.java @@ -42,9 +42,9 @@ public class CamelHeaderMapper implements HeaderMapper private static final LogAccessor LOGGER = new LogAccessor(CamelHeaderMapper.class); - private String[] inboundHeaderNames = { "*" }; + private String[] inboundHeaderNames = {"*"}; - private String[] outboundHeaderNames = { "*" }; + private String[] outboundHeaderNames = {"*"}; /** * Provide a list of patterns to map Apache Camel message headers into Spring Integration message. diff --git a/spring-integration-camel/src/test/java/org/springframework/integration/camel/dsl/CamelDslTests.java b/spring-integration-camel/src/test/java/org/springframework/integration/camel/dsl/CamelDslTests.java index c9ea099214..3ce2663897 100644 --- a/spring-integration-camel/src/test/java/org/springframework/integration/camel/dsl/CamelDslTests.java +++ b/spring-integration-camel/src/test/java/org/springframework/integration/camel/dsl/CamelDslTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.camel.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.SpringCamelContext; @@ -36,6 +34,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-camel/src/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java b/spring-integration-camel/src/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java index 136fe8d6a0..ac7b94f77f 100644 --- a/spring-integration-camel/src/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java +++ b/spring-integration-camel/src/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.camel.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.apache.camel.CamelExecutionException; import org.apache.camel.ExchangePattern; import org.apache.camel.ProducerTemplate; @@ -40,6 +37,9 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Artem Bilan * diff --git a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/dsl/CassandraMessageHandlerSpec.java b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/dsl/CassandraMessageHandlerSpec.java index 5a06c0e595..fee743af39 100644 --- a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/dsl/CassandraMessageHandlerSpec.java +++ b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/dsl/CassandraMessageHandlerSpec.java @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import com.datastax.oss.driver.api.core.cql.Statement; + import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.expression.Expression; @@ -28,8 +30,6 @@ import org.springframework.integration.dsl.MessageHandlerSpec; import org.springframework.integration.expression.FunctionExpression; import org.springframework.messaging.Message; -import com.datastax.oss.driver.api.core.cql.Statement; - /** * The {@link MessageHandlerSpec} for {@link CassandraMessageHandler}. * diff --git a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java index 281ad43b20..3f8059d32e 100644 --- a/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java +++ b/spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandler.java @@ -21,6 +21,15 @@ import java.util.List; import java.util.Map; import java.util.stream.StreamSupport; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder; +import com.datastax.oss.driver.api.core.cql.BatchType; +import com.datastax.oss.driver.api.core.cql.SimpleStatement; +import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.querybuilder.QueryBuilder; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveResultSet; import org.springframework.data.cassandra.ReactiveSession; @@ -44,15 +53,6 @@ import org.springframework.integration.handler.MessageProcessor; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.BatchStatementBuilder; -import com.datastax.oss.driver.api.core.cql.BatchType; -import com.datastax.oss.driver.api.core.cql.SimpleStatement; -import com.datastax.oss.driver.api.core.cql.Statement; -import com.datastax.oss.driver.api.querybuilder.QueryBuilder; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * An {@link AbstractReplyProducingMessageHandler} implementation for Cassandra outbound operations. * diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/IntegrationTestConfig.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/IntegrationTestConfig.java index 871336ea89..bceafdabe3 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/IntegrationTestConfig.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/IntegrationTestConfig.java @@ -80,7 +80,7 @@ public class IntegrationTestConfig extends AbstractReactiveCassandraConfiguratio @Override public String[] getEntityBasePackages() { - return new String[]{ Book.class.getPackage().getName() }; + return new String[] {Book.class.getPackage().getName()}; } } diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterIntegrationTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterIntegrationTests.java index d9d1029a78..f490b1981a 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterIntegrationTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterIntegrationTests.java @@ -16,12 +16,14 @@ package org.springframework.integration.cassandra.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; +import com.datastax.oss.driver.api.querybuilder.QueryBuilder; +import com.datastax.oss.driver.api.querybuilder.select.Select; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -41,10 +43,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.datastax.oss.driver.api.querybuilder.QueryBuilder; -import com.datastax.oss.driver.api.querybuilder.select.Select; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Filippo Balicchia diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterParserTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterParserTests.java index e9f686c432..a0322565f0 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterParserTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraOutboundAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.cassandra.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.integration.cassandra.outbound.CassandraMessageHandle import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Filippo Balicchia * @author Artem Bilan diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraParserUtilsTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraParserUtilsTests.java index 118e87e052..846de8cd76 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraParserUtilsTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraParserUtilsTests.java @@ -16,14 +16,14 @@ package org.springframework.integration.cassandra.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.integration.cassandra.config.xml.CassandraParserUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Filippo Balicchia * @author Artem Bilan diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/dsl/CassandraDslTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/dsl/CassandraDslTests.java index 0eaa855fba..4eee7c05fa 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/dsl/CassandraDslTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/dsl/CassandraDslTests.java @@ -18,7 +18,10 @@ package org.springframework.integration.cassandra.dsl; import java.time.Duration; +import com.datastax.oss.driver.api.core.ConsistencyLevel; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -40,10 +43,6 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.datastax.oss.driver.api.core.ConsistencyLevel; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; - /** * @author Artem Bilan * diff --git a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java index 459d978ed1..37f9468830 100644 --- a/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java +++ b/spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/outbound/CassandraMessageHandlerTests.java @@ -16,13 +16,16 @@ package org.springframework.integration.cassandra.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.List; import java.util.Map; +import com.datastax.oss.driver.api.core.ConsistencyLevel; +import com.datastax.oss.driver.api.querybuilder.QueryBuilder; +import com.datastax.oss.driver.api.querybuilder.select.Select; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -49,11 +52,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.datastax.oss.driver.api.core.ConsistencyLevel; -import com.datastax.oss.driver.api.querybuilder.QueryBuilder; -import com.datastax.oss.driver.api.querybuilder.select.Select; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Soby Chacko diff --git a/spring-integration-core/src/main/java/org/springframework/integration/JavaUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/JavaUtils.java index 3d8cbe5e6d..4c894e145f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/JavaUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/JavaUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -171,5 +171,4 @@ public final class JavaUtils { return this; } - } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java index 6249193ec3..ac7324918a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java @@ -683,9 +683,9 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageP processForceRelease(groupId, timestamp, lastModified); } catch (MessageDeliveryException ex) { - logger.warn(ex, () -> - "The MessageGroup [" + groupId + - "] is rescheduled by the reason of: "); + logger.warn(ex, () -> + "The MessageGroup [" + groupId + + "] is rescheduled by the reason of: "); scheduleGroupToForceComplete(groupId); } }, startTime.toInstant()); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandler.java index 97591b3f54..275e36ba07 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.function.Predicate; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; +import reactor.core.publisher.FluxSink; +import reactor.core.publisher.Mono; + import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.IntegrationPatternType; import org.springframework.integration.channel.ReactiveStreamsSubscribableChannel; @@ -30,11 +35,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.FluxSink; -import reactor.core.publisher.Mono; - /** * The {@link AbstractMessageProducingHandler} implementation for aggregation logic based * on Reactor's {@link Flux#groupBy} and {@link Flux#window} operators. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java index 45a0a9b195..42e7b51e52 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,18 +83,18 @@ public class MessageGroupExpiredEvent extends IntegrationEvent { sourceName = this.source.toString(); } builder.append("MessageGroupExpiredEvent [groupId=") - .append(this.groupId) - .append(", messageCount=") - .append(this.messageCount) - .append(", lastModified=") - .append(this.lastModified) - .append(", expiredAt=") - .append(this.expired) - .append(", discarded=") - .append(this.discarded) - .append(", source=") - .append(sourceName) - .append("]"); + .append(this.groupId) + .append(", messageCount=") + .append(this.messageCount) + .append(", lastModified=") + .append(this.lastModified) + .append(", expiredAt=") + .append(this.expired) + .append(", discarded=") + .append(this.discarded) + .append(", source=") + .append(sourceName) + .append("]"); return builder.toString(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java index 468211f146..a0b5def616 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ReleaseStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.integration.aggregator; import org.springframework.integration.store.MessageGroup; - /** * Strategy for determining when a group of messages reaches a state of * completion (i.e. can trip a barrier). diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java index 6026819111..673a33ab51 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregator.java @@ -37,7 +37,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * @author Artem Bilan * @author Chris Bono */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(Aggregators.class) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregators.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregators.java index 1899d71bf7..46202200cf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregators.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Aggregators.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Aggregators { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFrom.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFrom.java index 83a21561d0..d83a37d045 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFrom.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFrom.java @@ -43,7 +43,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * * @since 4.0 */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(BridgeFromRepeatable.class) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFromRepeatable.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFromRepeatable.java index 71b1346093..4cd2a93493 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFromRepeatable.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeFromRepeatable.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface BridgeFromRepeatable { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeTo.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeTo.java index 66c85f95f9..c8b86dabb5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeTo.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeTo.java @@ -48,7 +48,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * * @since 4.0 */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(BridgeToRepeatable.class) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeToRepeatable.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeToRepeatable.java index 43db2e971b..2f0ebe40e7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeToRepeatable.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/BridgeToRepeatable.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface BridgeToRepeatable { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/CorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/CorrelationStrategy.java index a9b55b3832..c904082da7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/CorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/CorrelationStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ import java.lang.annotation.Target; * * @author Marius Bogoevici */ -@Retention (RetentionPolicy.RUNTIME) -@Target (ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) @Documented public @interface CorrelationStrategy { } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java index 248ce12f13..bab4246136 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java @@ -45,7 +45,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * * @since 2.0 */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(Filters.class) @@ -86,7 +86,7 @@ public @interface Filter { * Only the handler is advised, not the downstream flow. * @return the advice chain. */ - String[] adviceChain() default { }; + String[] adviceChain() default {}; /** * When {@code true} (default) any discard action (and exception thrown) will occur diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filters.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filters.java index c4a091471d..6038733ff0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filters.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filters.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Filters { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java index 66fddf272b..3a56ce1f1f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ import java.lang.annotation.Target; * * @see MessagingGateway */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Gateway { @@ -123,6 +123,6 @@ public @interface Gateway { * Specify additional headers that will be added to the request message. * @return the headers. */ - GatewayHeader[] headers() default { }; + GatewayHeader[] headers() default {}; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/GatewayHeader.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/GatewayHeader.java index 22ca74b7e5..4cb02b29f7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/GatewayHeader.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/GatewayHeader.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import java.lang.annotation.Target; * @author Artem Bilan * @since 4.0 */ -@Target({ }) +@Target({}) @Retention(RetentionPolicy.RUNTIME) public @interface GatewayHeader { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapter.java index 54b5a5be3b..79e1fb510f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapter.java @@ -51,7 +51,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * * @since 4.0 */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(InboundChannelAdapters.class) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapters.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapters.java index e21f26b896..9d806a9d38 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapters.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/InboundChannelAdapters.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface InboundChannelAdapters { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java index 3acf78723d..a41316d980 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/IntegrationComponentScan.java @@ -54,7 +54,7 @@ public @interface IntegrationComponentScan { * @return the array of 'basePackages'. */ @AliasFor("basePackages") - String[] value() default { }; + String[] value() default {}; /** * Base packages to scan for annotated components. The {@link #value()} is an alias @@ -63,7 +63,7 @@ public @interface IntegrationComponentScan { * @return the array of 'basePackages'. */ @AliasFor("value") - String[] basePackages() default { }; + String[] basePackages() default {}; /** * Type-safe alternative to {@link #basePackages()} for specifying the packages to @@ -72,7 +72,7 @@ public @interface IntegrationComponentScan { * serves no purpose other than being referenced by this attribute. * @return the array of 'basePackageClasses'. */ - Class[] basePackageClasses() default { }; + Class[] basePackageClasses() default {}; /** @@ -96,7 +96,7 @@ public @interface IntegrationComponentScan { * @since 5.0 * @see #excludeFilters() */ - Filter[] includeFilters() default { }; + Filter[] includeFilters() default {}; /** * Specifies which types are not eligible for component scanning. @@ -104,7 +104,7 @@ public @interface IntegrationComponentScan { * @since 5.0 * @see #includeFilters() */ - Filter[] excludeFilters() default { }; + Filter[] excludeFilters() default {}; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java index d05a16f273..3cbcb355cf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java @@ -133,7 +133,7 @@ public @interface MessagingGateway { * all methods on the service-interface (unless overridden by a specific method). * @return the suggested payload expression, if any */ - GatewayHeader[] defaultHeaders() default { }; + GatewayHeader[] defaultHeaders() default {}; /** * An {@link org.springframework.integration.gateway.MethodArgsMessageMapper} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Payloads.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Payloads.java index b1313a9d9d..4023388bb1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Payloads.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Payloads.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import java.lang.annotation.Target; * @author Dave Syer * @since 2.0 */ -@Target({ ElementType.PARAMETER, ElementType.METHOD }) +@Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Payloads { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java index 7f18f0d80f..e0311446d2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Publisher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ import org.springframework.core.annotation.AliasFor; * * @see org.springframework.integration.aop.MessagePublishingInterceptor */ -@Target({ ElementType.METHOD, ElementType.TYPE }) +@Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Publisher { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Role.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Role.java index 76fdbd9317..99dd421f52 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Role.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Role.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * * @since 4.2 */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Role { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java index d1d62030d8..7fb3487171 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java @@ -48,7 +48,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * @author Artem Bilan * @author Chris Bono */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(Routers.class) @@ -74,7 +74,7 @@ public @interface Router { * @return the channelMappings. * @see org.springframework.integration.router.AbstractMappingMessageRouter#setChannelMapping(String, String) */ - String[] channelMappings() default { }; + String[] channelMappings() default {}; /** * Specify a prefix to be added to each channel name prior to resolution. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Routers.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Routers.java index 2a1583ca44..71011076b7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Routers.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Routers.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Routers { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java index ea7755d59f..1dee83c3bc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java @@ -46,7 +46,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * @author Yilin Wei * @author Chris Bono */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(ServiceActivators.class) @@ -81,7 +81,7 @@ public @interface ServiceActivator { * Only the handler is advised, not the downstream flow. * @return the advice chain. */ - String[] adviceChain() default { }; + String[] adviceChain() default {}; /** * Specify the maximum amount of time in milliseconds to wait when sending a reply diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivators.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivators.java index 50526a44a8..cbc419781c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivators.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivators.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface ServiceActivators { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java index 8a4d12e908..5312994b43 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java @@ -46,7 +46,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * @author Artem Bilan * @author Chris Bono */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(Splitters.class) @@ -83,7 +83,7 @@ public @interface Splitter { * Only the handler is advised, not the downstream flow. * @return the advice chain. */ - String[] adviceChain() default { }; + String[] adviceChain() default {}; /** * Specify the maximum amount of time in milliseconds to wait when sending a reply diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitters.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitters.java index a81227e0c8..524ef9ed0d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitters.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitters.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Splitters { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformer.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformer.java index 2898a5dee2..12b676eb01 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformer.java @@ -34,7 +34,7 @@ import org.springframework.messaging.handler.annotation.ValueConstants; * @author Artem Bilan * @author Chris Bono */ -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Documented @Repeatable(Transformers.class) @@ -59,7 +59,7 @@ public @interface Transformer { * Only the handler is advised, not the downstream flow. * @return the advice chain. */ - String[] adviceChain() default { }; + String[] adviceChain() default {}; /** * Specify the maximum amount of time in milliseconds to wait when sending a reply diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformers.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformers.java index caa0d51d9c..0267d2e2eb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformers.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Transformers.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * @since 6.0 */ @Documented -@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface Transformers { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/UseSpelInvoker.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/UseSpelInvoker.java index f27da42775..55cc36592c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/UseSpelInvoker.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/UseSpelInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.core.annotation.AliasFor; * @author Gary Russell * @since 5.0 */ -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE }) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java index 2c53d14371..16316be23f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2021 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,11 +22,6 @@ import java.util.concurrent.locks.LockSupport; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; - -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageDeliveryException; -import org.springframework.util.Assert; - import reactor.core.Disposable; import reactor.core.Disposables; import reactor.core.publisher.Flux; @@ -35,6 +30,10 @@ import reactor.core.publisher.Sinks; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.util.Assert; + /** * The {@link AbstractMessageChannel} implementation for the * Reactive Streams {@link Publisher} based on the Project Reactor {@link Flux}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java index 849474d3ec..55ae6b228a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -132,19 +132,23 @@ public class NullChannel implements PollableChannel, ((Publisher) payload).subscribe( new Subscriber() { - @Override public void onSubscribe(Subscription subscription) { + @Override + public void onSubscribe(Subscription subscription) { subscription.request(Long.MAX_VALUE); } - @Override public void onNext(Object value) { + @Override + public void onNext(Object value) { } - @Override public void onError(Throwable ex) { + @Override + public void onError(Throwable ex) { LOG.warn(ex, "An error happened in a reactive stream processing"); } - @Override public void onComplete() { + @Override + public void onComplete() { } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java index 27adec2d92..0ef96689bf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,7 +90,7 @@ public class QueueChannel extends AbstractPollableChannel implements QueueChanne super.registerMetricsCaptor(metricsCaptor); this.sizeGauge = metricsCaptor.gaugeBuilder("spring.integration.channel.queue.size", this, - (channel) -> getQueueSize()) + (channel) -> getQueueSize()) .tag("name", getComponentName() == null ? "unknown" : getComponentName()) .tag("type", "channel") .description("The size of the queue channel") @@ -98,7 +98,7 @@ public class QueueChannel extends AbstractPollableChannel implements QueueChanne this.remainingCapacityGauge = metricsCaptor.gaugeBuilder("spring.integration.channel.queue.remaining.capacity", this, - (channel) -> getRemainingCapacity()) + (channel) -> getRemainingCapacity()) .tag("name", getComponentName() == null ? "unknown" : getComponentName()) .tag("type", "channel") .description("The remaining capacity of the queue channel") diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java index e5699617e5..42f3c28cd7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class GlobalChannelInterceptorWrapper implements Ordered { private final ChannelInterceptor channelInterceptor; - private volatile String[] patterns = { "*" }; // default + private volatile String[] patterns = {"*"}; // default private volatile int order = 0; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptor.java index f73ce05445..543cc2aa6e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptor.java @@ -16,6 +16,10 @@ package org.springframework.integration.channel.interceptor; +import io.micrometer.common.lang.Nullable; +import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationRegistry; + import org.springframework.aop.support.AopUtils; import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.Message; @@ -23,10 +27,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; -import io.micrometer.common.lang.Nullable; -import io.micrometer.observation.Observation; -import io.micrometer.observation.ObservationRegistry; - /** * The {@link org.springframework.messaging.support.ExecutorChannelInterceptor} * implementation responsible for an {@link Observation} propagation from one message diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ThreadStatePropagationChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ThreadStatePropagationChannelInterceptor.java index 80993872a9..e8ca112455 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ThreadStatePropagationChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ThreadStatePropagationChannelInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.channel.interceptor; +import io.micrometer.common.lang.Nullable; + import org.springframework.integration.support.MessageDecorator; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; @@ -23,8 +25,6 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.ExecutorChannelInterceptor; -import io.micrometer.common.lang.Nullable; - /** * The {@link ExecutorChannelInterceptor} implementation responsible for * the {@link Thread} (any?) state propagation from one message flow's thread to another diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java index 7ea31a4d69..b5138d1c3f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoCodec.java @@ -21,14 +21,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.springframework.integration.codec.Codec; -import org.springframework.util.Assert; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.util.Pool; +import org.springframework.integration.codec.Codec; +import org.springframework.util.Assert; + /** * Base class for {@link Codec}s using {@link Kryo}. * Manages pooled {@link Kryo} instances. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java index 24c04a8fff..d3f52cffa4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java @@ -16,11 +16,10 @@ package org.springframework.integration.codec.kryo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Registration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Base class for {@link KryoRegistrar} implementations. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/CompositeKryoRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/CompositeKryoRegistrar.java index 844fa4ec8d..dbc414a879 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/CompositeKryoRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/CompositeKryoRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,12 @@ package org.springframework.integration.codec.kryo; import java.util.ArrayList; import java.util.List; -import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Registration; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; + /** * A {@link KryoRegistrar} that delegates and validates registrations across all components. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java index 73b8306379..3974be77d0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import com.esotericsoftware.kryo.Registration; + import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import com.esotericsoftware.kryo.Registration; - /** * A {@link KryoRegistrar} used to validateRegistration a * list of Java classes. This assigns a sequential registration ID starting with an initial value (50 by default), but diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java index 8152400221..38d3fa3bf1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.util.CollectionUtils; - import com.esotericsoftware.kryo.Registration; +import org.springframework.util.CollectionUtils; + /** * A {@link KryoRegistrar} implementation backed by a Map * used to explicitly set the registration ID for each class. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageHeadersSerializer.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageHeadersSerializer.java index 32a77d36bc..3afa048d1a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageHeadersSerializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageHeadersSerializer.java @@ -19,13 +19,13 @@ package org.springframework.integration.codec.kryo; import java.util.HashMap; import java.util.Map; -import org.springframework.messaging.MessageHeaders; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; +import org.springframework.messaging.MessageHeaders; + /** * Kryo Serializer for {@link MessageHeaders}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageKryoRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageKryoRegistrar.java index ffc88ea5ad..dfd2cbc9fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageKryoRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MessageKryoRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,9 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; +import com.esotericsoftware.kryo.Kryo; +import com.esotericsoftware.kryo.Registration; + import org.springframework.integration.message.AdviceMessage; import org.springframework.integration.support.MutableMessage; import org.springframework.integration.support.MutableMessageHeaders; @@ -28,9 +31,6 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.Registration; - /** * Registers common MessageHeader types and Serializers. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MutableMessageHeadersSerializer.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MutableMessageHeadersSerializer.java index 5064e5fb9b..b3b436c554 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MutableMessageHeadersSerializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/MutableMessageHeadersSerializer.java @@ -19,12 +19,12 @@ package org.springframework.integration.codec.kryo; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.support.MutableMessageHeaders; -import org.springframework.messaging.MessageHeaders; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; +import org.springframework.integration.support.MutableMessageHeaders; +import org.springframework.messaging.MessageHeaders; + /** * Kryo Serializer for {@link MutableMessageHeaders}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/PojoCodec.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/PojoCodec.java index 327633181d..ae60b18803 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/PojoCodec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/PojoCodec.java @@ -19,14 +19,13 @@ package org.springframework.integration.codec.kryo; import java.util.Collections; import java.util.List; -import org.objenesis.strategy.StdInstantiatorStrategy; - -import org.springframework.util.CollectionUtils; - import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.util.DefaultInstantiatorStrategy; +import org.objenesis.strategy.StdInstantiatorStrategy; + +import org.springframework.util.CollectionUtils; /** * Kryo Codec that can encode and decode arbitrary types. Classes and associated diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/RegistrationIds.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/RegistrationIds.java index 23d7297c6c..0dcf9dd6a1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/RegistrationIds.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/RegistrationIds.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,6 +45,7 @@ public final class RegistrationIds { public static final int DEFAULT_UUID_ID = 48; - private RegistrationIds() { } + private RegistrationIds() { + } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java index 69457aa69b..b3903955e5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractMethodAnnotationPostProcessor.java @@ -32,6 +32,7 @@ import org.aopalliance.aop.Advice; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; @@ -109,8 +110,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import reactor.core.publisher.Flux; - /** * Base class for Method-level annotation post-processors. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java index 0875571d98..6784a0a9be 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -199,19 +199,19 @@ public abstract class AbstractSimpleMessageHandlerFactoryBean ((ApplicationContextAware) this.handler).setApplicationContext(this.applicationContext)) - .acceptIfCondition(this.handler instanceof BeanFactoryAware && getBeanFactory() != null, - getBeanFactory(), - factory -> ((BeanFactoryAware) this.handler).setBeanFactory(factory)) - .acceptIfCondition(this.handler instanceof BeanNameAware && this.beanName != null, this.beanName, - name -> ((BeanNameAware) this.handler).setBeanName(this.beanName)) - .acceptIfCondition(this.handler instanceof ApplicationEventPublisherAware - && this.applicationEventPublisher != null, - this.applicationEventPublisher, - publisher -> ((ApplicationEventPublisherAware) this.handler) - .setApplicationEventPublisher(publisher)); + .acceptIfCondition(this.handler instanceof ApplicationContextAware && this.applicationContext != null, + this.applicationContext, + context -> ((ApplicationContextAware) this.handler).setApplicationContext(this.applicationContext)) + .acceptIfCondition(this.handler instanceof BeanFactoryAware && getBeanFactory() != null, + getBeanFactory(), + factory -> ((BeanFactoryAware) this.handler).setBeanFactory(factory)) + .acceptIfCondition(this.handler instanceof BeanNameAware && this.beanName != null, this.beanName, + name -> ((BeanNameAware) this.handler).setBeanName(this.beanName)) + .acceptIfCondition(this.handler instanceof ApplicationEventPublisherAware + && this.applicationEventPublisher != null, + this.applicationEventPublisher, + publisher -> ((ApplicationEventPublisherAware) this.handler) + .setApplicationEventPublisher(publisher)); configureOutputChannelIfAny(); Object actualHandler = extractTarget(this.handler); if (actualHandler == null) { @@ -221,11 +221,11 @@ public abstract class AbstractSimpleMessageHandlerFactoryBean ((AbstractMessageProducingHandler) handlerToConfigure).setAsync(asyncValue)) - .acceptIfCondition(this.handler instanceof Orderable && this.order != null, - this.order, theOrder -> ((Orderable) this.handler).setOrder(theOrder)); + .acceptIfCondition(this.async != null && actualHandler instanceof AbstractMessageProducingHandler, + this.async, + asyncValue -> ((AbstractMessageProducingHandler) handlerToConfigure).setAsync(asyncValue)) + .acceptIfCondition(this.handler instanceof Orderable && this.order != null, + this.order, theOrder -> ((Orderable) this.handler).setOrder(theOrder)); this.initialized = true; } initializingBean(); @@ -235,10 +235,10 @@ public abstract class AbstractSimpleMessageHandlerFactoryBean ((IntegrationObjectSupport) handlerToConfigure).setComponentName(name)) - .acceptIfNotNull(this.channelResolver, - resolver -> ((IntegrationObjectSupport) handlerToConfigure).setChannelResolver(resolver)); + .acceptIfNotNull(this.componentName, + name -> ((IntegrationObjectSupport) handlerToConfigure).setComponentName(name)) + .acceptIfNotNull(this.channelResolver, + resolver -> ((IntegrationObjectSupport) handlerToConfigure).setChannelResolver(resolver)); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelInitializer.java index 92a5661b5a..e38bfce642 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -71,7 +71,7 @@ public final class ChannelInitializer implements BeanFactoryAware, InitializingB return; } else { - AutoCreateCandidatesCollector channelCandidatesCollector = + AutoCreateCandidatesCollector channelCandidatesCollector = this.beanFactory.getBean(IntegrationContextUtils.AUTO_CREATE_CHANNEL_CANDIDATES_BEAN_NAME, AutoCreateCandidatesCollector.class); // at this point channelNames are all resolved with placeholders and SpEL diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java index 90a57dd84e..809e8b70e5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java @@ -22,6 +22,7 @@ import java.util.function.Function; import org.aopalliance.aop.Advice; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; @@ -62,8 +63,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import reactor.core.publisher.Flux; - /** * The {@link FactoryBean} implementation for {@link AbstractEndpoint} population. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java index 93ac2f1417..e99867e38c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/EnableIntegrationManagement.java @@ -39,7 +39,7 @@ import org.springframework.integration.support.management.micrometer.MicrometerM @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -@Import({ MicrometerMetricsCaptorImportSelector.class, IntegrationManagementConfiguration.class }) +@Import({MicrometerMetricsCaptorImportSelector.class, IntegrationManagementConfiguration.class}) public @interface EnableIntegrationManagement { @@ -72,6 +72,6 @@ public @interface EnableIntegrationManagement { * @since 6.0 * @see org.springframework.integration.support.utils.PatternMatchUtils#smartMatch(String, String...) */ - String[] observationPatterns() default { }; + String[] observationPatterns() default {}; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java index f9c03788db..caa1df993d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/GlobalChannelInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import java.lang.annotation.Target; * * @since 4.0 */ -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface GlobalChannelInterceptor { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java index f073533a7a..277f1171f7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfiguration.java @@ -20,6 +20,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import io.micrometer.observation.ObservationRegistry; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.EnvironmentAware; @@ -34,8 +36,6 @@ import org.springframework.integration.support.management.metrics.MetricsCaptor; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import io.micrometer.observation.ObservationRegistry; - /** * {@code @Configuration} class that registers a {@link IntegrationManagementConfigurer} bean. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java index 0cc75ad78e..f14b8290ce 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationManagementConfigurer.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import io.micrometer.observation.ObservationRegistry; import org.apache.commons.logging.Log; import org.springframework.beans.BeansException; @@ -42,8 +43,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; -import io.micrometer.observation.ObservationRegistry; - /** * Configures beans that implement {@link IntegrationManagement}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java index d4f63b0107..36fb99a83e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/IntegrationSimpleEvaluationContextFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,9 +80,9 @@ public class IntegrationSimpleEvaluationContextFactoryBean extends AbstractEvalu accessorArray[accessors.size() + 1] = DataBindingPropertyAccessor.forReadOnlyAccess(); SimpleEvaluationContext evaluationContext = SimpleEvaluationContext.forPropertyAccessors(accessorArray) - .withTypeConverter(getTypeConverter()) - .withInstanceMethods() - .build(); + .withTypeConverter(getTypeConverter()) + .withInstanceMethods() + .build(); for (Entry functionEntry : getFunctions().entrySet()) { evaluationContext.setVariable(functionEntry.getKey(), functionEntry.getValue()); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractDelegatingConsumerEndpointParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractDelegatingConsumerEndpointParser.java index b94a16fdec..a2bfb509d0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractDelegatingConsumerEndpointParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractDelegatingConsumerEndpointParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer else if (hasRef && hasExpression) { parserContext.getReaderContext().error( "Only one of 'ref' or 'expression' is permitted, not both, on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); return null; } else if (hasRef) { @@ -93,7 +93,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer if (hasRef || hasExpression || expressionElement != null) { parserContext.getReaderContext().error( "Neither 'ref' nor 'expression' are permitted when an inner bean () is configured on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); } builder.addPropertyValue("targetObject", innerDefinition); } @@ -104,7 +104,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer if (hasRef || hasExpression || expressionElement != null) { parserContext.getReaderContext().error( "Neither 'ref' nor 'expression' are permitted when an inner script element is configured on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); } BeanDefinition scriptBeanDefinition = parserContext.getDelegate().parseCustomElement(scriptElement, builder.getBeanDefinition()); builder.addPropertyValue("targetObject", scriptBeanDefinition); @@ -115,7 +115,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer if (hasRef || hasExpression) { parserContext.getReaderContext().error( "Neither 'ref' nor 'expression' are permitted when an inner 'expression' element is configured on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); } BeanDefinitionBuilder dynamicExpressionBuilder = BeanDefinitionBuilder.genericBeanDefinition( DynamicExpression.class); @@ -134,7 +134,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer if (hasExpression || expressionElement != null) { parserContext.getReaderContext().error( "A 'method' attribute is not permitted when configuring an 'expression' on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); } if (hasRef || innerDefinition != null) { builder.addPropertyValue("targetMethodName", method); @@ -142,7 +142,7 @@ abstract class AbstractDelegatingConsumerEndpointParser extends AbstractConsumer else { parserContext.getReaderContext().error("A 'method' attribute is only permitted when either " + "a 'ref' or inner-bean definition is provided on element " + - IntegrationNamespaceUtils.createElementDescription(element) + ".", source); + IntegrationNamespaceUtils.createElementDescription(element) + ".", source); } } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java index d03ffbcc66..7fb1f1a5b2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,15 +52,15 @@ public abstract class AbstractOutboundChannelAdapterParser extends AbstractChann String elementDescription = IntegrationNamespaceUtils.createElementDescription(element); parserContext.getReaderContext().error( "The 'channel' attribute isn't allowed for " + - elementDescription + - " when it is used as a nested element," + + elementDescription + + " when it is used as a nested element," + " e.g. inside a ", element); } AbstractBeanDefinition consumerBeanDefinition = this.parseConsumer(element, parserContext); this.configureRequestHandlerAdviceChain(element, parserContext, consumerBeanDefinition, null); return consumerBeanDefinition; } - BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ConsumerEndpointFactoryBean.class); + BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ConsumerEndpointFactoryBean.class); Element pollerElement = DomUtils.getChildElementByTagName(element, "poller"); BeanComponentDefinition handlerBeanComponentDefinition = this.doParseAndRegisterConsumer(element, parserContext); builder.addPropertyReference("handler", handlerBeanComponentDefinition.getBeanName()); @@ -81,7 +81,7 @@ public abstract class AbstractOutboundChannelAdapterParser extends AbstractChann } private void configureRequestHandlerAdviceChain(Element element, ParserContext parserContext, - BeanDefinition handlerBeanDefinition, BeanDefinitionBuilder consumerBuilder) { + BeanDefinition handlerBeanDefinition, BeanDefinitionBuilder consumerBuilder) { Element txElement = DomUtils.getChildElementByTagName(element, "transactional"); Element adviceChainElement = DomUtils.getChildElementByTagName(element, IntegrationNamespaceUtils.REQUEST_HANDLER_ADVICE_CHAIN); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java index b23ffc19dc..cf4b2c8984 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,6 @@ public abstract class AbstractOutboundGatewayParser extends AbstractConsumerEndp /** * Subclasses may override this method for additional configuration. - * @param builder The builder. * @param element The element. * @param parserContext The parser context. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java index 6980e3183b..712d58d977 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInterceptorParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class ChannelInterceptorParser { } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public ManagedList parseInterceptors(Element element, ParserContext parserContext) { ManagedList interceptors = new ManagedList(); NodeList childNodes = element.getChildNodes(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java index 6f41ac10a1..e0335245f2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/HeaderEnricherParserSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,9 +66,9 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar static { cannedHeaderElementExpressions.put("header-channels-to-string", new String[][] { {"replyChannel", "@" + IntegrationContextUtils.INTEGRATION_HEADER_CHANNEL_REGISTRY_BEAN_NAME - + ".channelToChannelName(headers.replyChannel, ####)" }, + + ".channelToChannelName(headers.replyChannel, ####)"}, {"errorChannel", "@" + IntegrationContextUtils.INTEGRATION_HEADER_CHANNEL_REGISTRY_BEAN_NAME - + ".channelToChannelName(headers.errorChannel, ####)" }, + + ".channelToChannelName(headers.errorChannel, ####)"}, }); } @@ -280,7 +280,7 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar } valueProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition(StaticHeaderValueMessageProcessor.class) - .addConstructorArgValue(headerValue); + .addConstructorArgValue(headerValue); } return valueProcessorBuilder; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java index 9e8c0462bd..9145740fc0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java @@ -429,7 +429,7 @@ public abstract class IntegrationNamespaceUtils { String[] handlerAlias = null; String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE); if (StringUtils.hasText(id)) { - handlerAlias = new String[] { id + IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX }; + handlerAlias = new String[] {id + IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX}; } return handlerAlias; } @@ -455,7 +455,7 @@ public abstract class IntegrationNamespaceUtils { parserContext, propertyName); } - @SuppressWarnings({ "rawtypes" }) + @SuppressWarnings({"rawtypes"}) public static void configureAndSetAdviceChainIfPresent(Element adviceChainElement, Element txElement, boolean handleMessageAdvice, BeanDefinition parentBeanDefinition, ParserContext parserContext, String propertyName) { @@ -474,7 +474,7 @@ public abstract class IntegrationNamespaceUtils { return configureAdviceChain(adviceChainElement, txElement, false, parentBeanDefinition, parserContext); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public static ManagedList configureAdviceChain(Element adviceChainElement, Element txElement, boolean handleMessageAdvice, BeanDefinition parentBeanDefinition, ParserContext parserContext) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RetryAdviceParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RetryAdviceParser.java index 440cd95999..5fa85ce0a1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RetryAdviceParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/RetryAdviceParser.java @@ -100,6 +100,7 @@ public class RetryAdviceParser extends AbstractBeanDefinitionParser { } } + private static final class ParsedExponentialBackOffPolicy extends ExponentialBackOffPolicy { ParsedExponentialBackOffPolicy() { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java index 23b5950f5e..dc95a03fcf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/SelectorChainParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ public class SelectorChainParser extends AbstractSingleBeanDefinitionParser { parseSelectorChain(builder, element, parserContext); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) private void parseSelectorChain(BeanDefinitionBuilder builder, Element element, ParserContext parserContext) { IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "voting-strategy"); ManagedList selectors = new ManagedList(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParser.java index dfa4638ba0..d2db0b0266 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.springframework.integration.transaction.DefaultTransactionSynchroniza import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; + /** * Parser for transaction-synchronization-factory element. * @@ -44,9 +45,9 @@ public class TransactionSynchronizationFactoryParser extends BeanDefinitionBuilder syncFactoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(DefaultTransactionSynchronizationFactory.class); - Element beforeCommitElement = DomUtils.getChildElementByTagName(element, "before-commit"); - Element afterCommitElement = DomUtils.getChildElementByTagName(element, "after-commit"); - Element afterRollbackElement = DomUtils.getChildElementByTagName(element, "after-rollback"); + Element beforeCommitElement = DomUtils.getChildElementByTagName(element, "before-commit"); + Element afterCommitElement = DomUtils.getChildElementByTagName(element, "after-commit"); + Element afterRollbackElement = DomUtils.getChildElementByTagName(element, "after-rollback"); if (this.elementsNotDefined(beforeCommitElement, afterCommitElement, afterRollbackElement)) { parserContext.getReaderContext().error("At least one sub-element " + @@ -95,6 +96,7 @@ public class TransactionSynchronizationFactoryParser extends } return true; } + private boolean attributesNotDefined(String... attributes) { for (String attribute : attributes) { if (StringUtils.hasText(attribute)) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java index 6022eedecf..8cf47678aa 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationProperties.java @@ -128,9 +128,9 @@ public final class IntegrationProperties { private boolean messagingTemplateThrowExceptionOnLateReply = false; - private String[] readOnlyHeaders = { }; + private String[] readOnlyHeaders = {}; - private String[] noAutoStartupEndpoints = { }; + private String[] noAutoStartupEndpoints = {}; private volatile Properties properties; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java index fbe3f5ac84..390fd0b8cd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ import org.springframework.util.StringUtils; * * @since 1.0.3 */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({"unchecked"}) class OrderedAwareCopyOnWriteArraySet implements Set { private final OrderComparator comparator = new OrderComparator(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BarrierSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BarrierSpec.java index 769617d723..6b1fdc061c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BarrierSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BarrierSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.dsl; +import reactor.util.function.Tuple2; + import org.springframework.core.Ordered; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.aggregator.BarrierMessageHandler; @@ -26,8 +28,6 @@ import org.springframework.integration.aggregator.MessageGroupProcessor; import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.util.Assert; -import reactor.util.function.Tuple2; - /** * A {@link MessageHandlerSpec} for the {@link BarrierMessageHandler}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java index 9eb635003a..f004c2a0a8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java @@ -26,6 +26,8 @@ import java.util.function.Consumer; import java.util.function.Function; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.util.function.Tuple2; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; @@ -96,9 +98,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import reactor.core.publisher.Flux; -import reactor.util.function.Tuple2; - /** * The {@code Builder} pattern implementation for the EIP-method chain. * Provides a variety of methods to populate Spring Integration components diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java index 0d276e6e9e..ed6566b256 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/ConsumerEndpointSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,9 @@ import java.util.function.Function; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.util.function.Tuple2; import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.integration.handler.AbstractMessageHandler; @@ -42,10 +45,6 @@ import org.springframework.transaction.TransactionManager; import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.util.Assert; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.util.function.Tuple2; - /** * A {@link EndpointSpec} for consumer endpoints. * @@ -92,6 +91,7 @@ public abstract class ConsumerEndpointSpec, public S reactive() { return reactive(Function.identity()); } + /** * Make the consumer endpoint as reactive independently of an input channel and * apply the provided function into the {@link Flux#transform(Function)} operator. @@ -134,7 +134,7 @@ public abstract class ConsumerEndpointSpec, * @since 5.3 */ public S handleMessageAdvice(MethodInterceptor... interceptors) { - for (MethodInterceptor interceptor: interceptors) { + for (MethodInterceptor interceptor : interceptors) { advice(new HandleMessageAdviceAdapter(interceptor)); } return _this(); @@ -229,7 +229,7 @@ public abstract class ConsumerEndpointSpec, * @since 5.3 * @see ReactiveRequestHandlerAdvice */ - @SuppressWarnings({ "unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked", "rawtypes"}) public S customizeMonoReply(BiFunction, Mono, Publisher> replyCustomizer) { return advice(new ReactiveRequestHandlerAdvice( (BiFunction, Mono, Publisher>) (BiFunction) replyCustomizer)); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java index cd6ef54d7d..b1253dd8d8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EndpointSpec.java @@ -20,6 +20,9 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Function; +import reactor.util.function.Tuple2; +import reactor.util.function.Tuples; + import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.integration.channel.DirectChannel; @@ -28,9 +31,6 @@ import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; -import reactor.util.function.Tuple2; -import reactor.util.function.Tuples; - /** * An {@link IntegrationComponentSpec} for endpoints. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EnricherSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EnricherSpec.java index 80a1d3a308..8bc1d7baf9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/EnricherSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/EnricherSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import reactor.util.function.Tuple2; + import org.springframework.expression.Expression; import org.springframework.integration.config.ConsumerEndpointFactoryBean; import org.springframework.integration.expression.FunctionExpression; @@ -33,8 +35,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; -import reactor.util.function.Tuple2; - /** * A {@link ConsumerEndpointSpec} extension for the {@link ContentEnricher}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java index 97104c2649..1495837514 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/HeaderEnricherSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,8 @@ import java.util.Map.Entry; import java.util.function.Consumer; import java.util.function.Function; +import reactor.util.function.Tuple2; + import org.springframework.expression.Expression; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.config.ConsumerEndpointFactoryBean; @@ -44,8 +46,6 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import reactor.util.function.Tuple2; - /** * An {@link IntegrationComponentSpec} for a {@link HeaderEnricher}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationComponentSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationComponentSpec.java index 1c3c8410c0..9ca2ade6ad 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationComponentSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationComponentSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public abstract class IntegrationComponentSpec getIntegrationComponents() { + @Override + public Map getIntegrationComponents() { return this.targetIntegrationFlow.getIntegrationComponents(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageSourceSpec.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageSourceSpec.java index ac67fb7420..17c10c49f3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageSourceSpec.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/MessageSourceSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ public abstract class MessageSourceSpec, H ext public S messageHeaders(Map headerExpressions) { Assert.state(this.target instanceof AbstractMessageSource, () -> "'MessageSource' must be an instance of 'AbstractMessageSource', not " - + this.target.getClass()); + + this.target.getClass()); ((AbstractMessageSource) this.target).setHeaderExpressions(headerExpressions); return _this(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PublisherIntegrationFlow.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PublisherIntegrationFlow.java index d8dcb670a6..f37a419629 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/PublisherIntegrationFlow.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/PublisherIntegrationFlow.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,10 @@ import java.util.Map; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; +import reactor.core.publisher.Flux; import org.springframework.messaging.Message; -import reactor.core.publisher.Flux; - /** * * @param the message payload type. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java b/spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java index c6e73a7bd8..76b583f587 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dsl/Transformers.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; import org.springframework.core.convert.converter.Converter; @@ -46,9 +48,6 @@ import org.springframework.integration.transformer.SyslogToMapTransformer; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * An utility class to provide methods for out-of-the-box * {@link org.springframework.integration.transformer.Transformer}s. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java index 8ee5140fa5..1f33c51e7d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -211,8 +211,8 @@ public abstract class AbstractMessageSource extends AbstractExpressionEvaluat return CollectionUtils.isEmpty(this.headerExpressions) ? null : ExpressionEvalMap.from(this.headerExpressions) - .usingEvaluationContext(getEvaluationContext()) - .build(); + .usingEvaluationContext(getEvaluationContext()) + .build(); } /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java index 060ea3d7a2..68cafafc58 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java @@ -28,6 +28,9 @@ import java.util.stream.Collectors; import org.aopalliance.aop.Advice; import org.reactivestreams.Subscription; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; @@ -62,10 +65,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ErrorHandler; import org.springframework.util.ReflectionUtils; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Schedulers; - /** * An {@link AbstractEndpoint} extension for Polling Consumer pattern basics. * The standard polling logic is based on a periodic task scheduling according the provided diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java index 87e4324927..8ba458d68b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java @@ -16,8 +16,10 @@ package org.springframework.integration.endpoint; +import io.micrometer.observation.ObservationRegistry; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; +import reactor.core.publisher.Flux; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.SmartInitializingSingleton; @@ -45,9 +47,6 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import io.micrometer.observation.ObservationRegistry; -import reactor.core.publisher.Flux; - /** * A support class for producer endpoints that provides a setter for the * output channel and a convenience method for sending Messages. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducer.java index 35f1834b4b..443e947dd0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ package org.springframework.integration.endpoint; import java.time.Duration; +import reactor.core.publisher.Flux; + import org.springframework.integration.core.MessageSource; import org.springframework.integration.util.IntegrationReactiveUtils; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import reactor.core.publisher.Flux; - /** * The {@link MessageProducerSupport} to adapt a provided {@link MessageSource} * into a {@link Flux} and let it be subscribed in the {@link #subscribeToPublisher}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java index 35dc6753cf..e36b8ce332 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,10 @@ import java.util.function.Function; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; +import reactor.core.CoreSubscriber; +import reactor.core.Disposable; +import reactor.core.publisher.BaseSubscriber; +import reactor.core.publisher.Flux; import org.springframework.context.Lifecycle; import org.springframework.integration.channel.ChannelUtils; @@ -38,11 +42,6 @@ import org.springframework.messaging.ReactiveMessageHandler; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; -import reactor.core.CoreSubscriber; -import reactor.core.Disposable; -import reactor.core.publisher.BaseSubscriber; -import reactor.core.publisher.Flux; - /** * An {@link AbstractEndpoint} implementation for Reactive Streams subscription into an diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index ef4286350b..1c4c5090c8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -235,5 +235,4 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint } } - } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/events/IntegrationEvent.java b/spring-integration-core/src/main/java/org/springframework/integration/events/IntegrationEvent.java index a56316eacb..a47fea9f4d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/events/IntegrationEvent.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/events/IntegrationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,5 +66,4 @@ public abstract class IntegrationEvent extends ApplicationEvent { (this.cause == null ? "" : ", cause=" + this.cause) + "]"; } - } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionUtils.java index c20f29f3b5..99c23f6fbe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/ExpressionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -138,7 +138,7 @@ public final class ExpressionUtils { if (simple) { Builder ecBuilder = SimpleEvaluationContext.forPropertyAccessors( - new MapAccessor(), DataBindingPropertyAccessor.forReadOnlyAccess()) + new MapAccessor(), DataBindingPropertyAccessor.forReadOnlyAccess()) .withInstanceMethods(); if (conversionService != null) { ecBuilder.withConversionService(conversionService); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java index 57b930292c..a9957ca095 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/ReloadableResourceBundleExpressionSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc private final ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - private String[] basenames = { }; + private String[] basenames = {}; private String defaultEncoding; @@ -120,7 +120,7 @@ public class ReloadableResourceBundleExpressionSource implements ExpressionSourc * @see java.util.ResourceBundle */ public void setBasename(String basename) { - setBasenames(new String[] { basename }); + setBasenames(new String[] {basename}); } /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java index 78ebe445ee..ae1e6238ac 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class MethodInvokingSelector extends AbstractMessageProcessingSelector { super(new MethodInvokingMessageProcessor(object, method)); Class returnType = method.getReturnType(); Assert.isTrue(boolean.class.isAssignableFrom(returnType) - || Boolean.class.isAssignableFrom(returnType), + || Boolean.class.isAssignableFrom(returnType), "MethodInvokingSelector method must return a boolean result."); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index f8395edb34..624c621f54 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; +import reactor.core.publisher.Mono; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; @@ -86,8 +87,6 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.ReflectionUtils; import org.springframework.util.StringUtils; -import reactor.core.publisher.Mono; - /** * Generates a proxy for the provided service interface to enable interaction diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java index bd6142e47e..5ecb01511a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java @@ -20,8 +20,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import io.micrometer.observation.ObservationRegistry; import org.reactivestreams.Publisher; import org.reactivestreams.Subscriber; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -71,10 +74,6 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.Assert; -import io.micrometer.observation.ObservationRegistry; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; - /** * A convenient base class for connecting application code to * {@link MessageChannel}s for sending, receiving, or request-reply operations. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/graph/IntegrationGraphServer.java b/spring-integration-core/src/main/java/org/springframework/integration/graph/IntegrationGraphServer.java index 85eeeb139f..a95324a875 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/graph/IntegrationGraphServer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/graph/IntegrationGraphServer.java @@ -236,7 +236,7 @@ public class IntegrationGraphServer implements ApplicationContextAware, Applicat .peek(nodes::add) .forEach(gatewayNode -> producerLink(links, channelNodes, gatewayNode)); - @SuppressWarnings({ "rawtypes", "unchecked"}) + @SuppressWarnings({"rawtypes", "unchecked"}) Map> gpfbs = (Map) getBeansOfType(GatewayProxyFactoryBean.class); for (Entry> entry : gpfbs.entrySet()) { @@ -517,7 +517,7 @@ public class IntegrationGraphServer implements ApplicationContextAware, Applicat Collection routes = Stream.concat(router.getChannelMappings().values().stream(), - router.getDynamicChannelNames().stream()) + router.getDynamicChannelNames().stream()) .collect(Collectors.toList()); String inputChannel = channelToBeanName(consumer.getInputChannel()); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/graph/MicrometerNodeEnhancer.java b/spring-integration-core/src/main/java/org/springframework/integration/graph/MicrometerNodeEnhancer.java index 28b6e7af9a..727ee7939c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/graph/MicrometerNodeEnhancer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/graph/MicrometerNodeEnhancer.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ package org.springframework.integration.graph; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.springframework.context.ApplicationContext; -import org.springframework.integration.support.management.IntegrationManagement; - import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; +import org.springframework.context.ApplicationContext; +import org.springframework.integration.support.management.IntegrationManagement; + /** * Add micrometer metrics to the node. * @@ -110,10 +110,10 @@ public class MicrometerNodeEnhancer { } TimerStats successes = successTimer == null ? ZERO_TIMER_STATS : new TimerStats(successTimer.count(), successTimer.mean(TimeUnit.MILLISECONDS), - successTimer.max(TimeUnit.MILLISECONDS)); + successTimer.max(TimeUnit.MILLISECONDS)); TimerStats failures = failureTimer == null ? ZERO_TIMER_STATS : new TimerStats(failureTimer.count(), failureTimer.mean(TimeUnit.MILLISECONDS), - failureTimer.max(TimeUnit.MILLISECONDS)); + failureTimer.max(TimeUnit.MILLISECONDS)); return new SendTimers(successes, failures); } @@ -137,10 +137,10 @@ public class MicrometerNodeEnhancer { Counter failures = null; try { failures = this.registry.get(IntegrationManagement.RECEIVE_COUNTER_NAME) - .tag(TAG_TYPE, type) - .tag(TAG_NAME, name) - .tag(TAG_RESULT, "failure") - .counter(); + .tag(TAG_TYPE, type) + .tag(TAG_NAME, name) + .tag(TAG_RESULT, "failure") + .counter(); } catch (@SuppressWarnings(UNUSED) Exception e) { // NOSONAR ignored // NOSONAR empty; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 8898dbb365..7de6914c67 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -16,7 +16,9 @@ package org.springframework.integration.handler; +import io.micrometer.observation.ObservationRegistry; import org.reactivestreams.Subscription; +import reactor.core.CoreSubscriber; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.support.management.metrics.MetricsCaptor; @@ -31,9 +33,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; -import io.micrometer.observation.ObservationRegistry; -import reactor.core.CoreSubscriber; - /** * Base class for {@link MessageHandler} implementations. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProducingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProducingHandler.java index 2e48a782d0..bb0790df73 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProducingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProducingHandler.java @@ -29,6 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Schedulers; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -55,10 +58,6 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Schedulers; - /** * The base {@link AbstractMessageHandler} implementation for the {@link MessageProducer}. * @@ -165,7 +164,7 @@ public abstract class AbstractMessageProducingHandler extends AbstractMessageHan } if (headerPatterns.contains("*")) { - this.notPropagatedHeaders = new String[]{ "*" }; + this.notPropagatedHeaders = new String[] {"*"}; this.noHeadersPropagation = true; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReactiveMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReactiveMessageHandler.java index 3bee00f28a..275a1fabbf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReactiveMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReactiveMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.handler; +import reactor.core.publisher.Mono; + import org.springframework.core.log.LogMessage; import org.springframework.integration.history.MessageHistory; import org.springframework.messaging.Message; import org.springframework.messaging.ReactiveMessageHandler; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * Base class for {@link ReactiveMessageHandler} implementations. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java index 13ea21b6b8..f891ee6c70 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ import org.springframework.messaging.Message; * */ public abstract class AbstractReplyProducingPostProcessingMessageHandler - extends AbstractReplyProducingMessageHandler - implements PostProcessingMessageHandler { + extends AbstractReplyProducingMessageHandler + implements PostProcessingMessageHandler { private volatile boolean postProcessWithinAdvice = true; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java index f208636c76..0370fdc675 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java @@ -187,7 +187,7 @@ public class LambdaMessageProcessor implements MessageProcessor, BeanFac return args; } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) private Object invokeMethod(Object[] args) throws InvocationTargetException, IllegalAccessException { if (this.target instanceof Function function) { return function.apply(args[0]); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerSupport.java index 793fbc79ba..28b3d9f573 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerSupport.java @@ -19,6 +19,8 @@ package org.springframework.integration.handler; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import io.micrometer.observation.ObservationRegistry; + import org.springframework.core.Ordered; import org.springframework.integration.IntegrationPattern; import org.springframework.integration.IntegrationPatternType; @@ -31,8 +33,6 @@ import org.springframework.integration.support.management.metrics.MeterFacade; import org.springframework.integration.support.management.metrics.MetricsCaptor; import org.springframework.integration.support.management.metrics.TimerFacade; -import io.micrometer.observation.ObservationRegistry; - /** * Base class for Message handling components that provides basic validation and error * handling capabilities. Asserts that the incoming Message is not null and that it does diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java index 15e7dddd37..73ed529304 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,9 +159,9 @@ public abstract class AbstractRequestHandlerAdvice extends IntegrationObjectSupp public Object cloneAndExecute() { try { /* - * If we don't copy the invocation carefully it won't keep a reference to the other - * interceptors in the chain. - */ + * If we don't copy the invocation carefully it won't keep a reference to the other + * interceptors in the chain. + */ if (this.invocation instanceof ProxyMethodInvocation) { return ((ProxyMethodInvocation) this.invocation).invocableClone().proceed(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java index d9263ad056..b469020020 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -275,7 +275,7 @@ public class CacheRequestHandlerAdvice extends AbstractRequestHandlerAdvice @Nullable Object invoke(CacheOperationInvoker invoker, Object target, Message message) { - return super.execute(invoker, target, HANDLE_REQUEST_METHOD, new Object[] { message }); // NOSONAR + return super.execute(invoker, target, HANDLE_REQUEST_METHOD, new Object[] {message}); // NOSONAR } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdvice.java index d6e56325fc..73baead1de 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,16 +18,16 @@ package org.springframework.integration.handler.advice; import java.time.Duration; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessagingException; -import org.springframework.util.Assert; - import io.github.resilience4j.ratelimiter.RateLimiter; import io.github.resilience4j.ratelimiter.RateLimiterConfig; import io.github.resilience4j.ratelimiter.RequestNotPermitted; import io.vavr.CheckedFunction0; import io.vavr.control.Try; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.util.Assert; + /** * An {@link AbstractRequestHandlerAdvice} extension for a rate limiting to service method calls. * The implementation is based on the diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ReactiveRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ReactiveRequestHandlerAdvice.java index 9c2ba012b6..c044182e51 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ReactiveRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ReactiveRequestHandlerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,12 +24,11 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; +import reactor.core.publisher.Mono; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * A {@link MethodInterceptor} for message handlers producing a {@link Mono} as a payload for reply. * The returned {@link Mono} is customized via {@link Mono#transform(java.util.function.Function)} operator diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/support/ContinuationHandlerMethodArgumentResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/ContinuationHandlerMethodArgumentResolver.java index 8522d24e07..1c4e79f2d8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/support/ContinuationHandlerMethodArgumentResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/support/ContinuationHandlerMethodArgumentResolver.java @@ -16,13 +16,13 @@ package org.springframework.integration.handler.support; +import reactor.core.publisher.Mono; + import org.springframework.core.MethodParameter; import org.springframework.integration.util.CoroutinesUtils; import org.springframework.messaging.Message; import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; -import reactor.core.publisher.Mono; - /** * No-op resolver for method arguments of type {@link kotlin.coroutines.Continuation}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java index f3fc16dcfe..63ce9737c7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java @@ -27,6 +27,7 @@ import java.util.Objects; import java.util.Properties; import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonCreator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,8 +44,6 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.Assert; -import com.fasterxml.jackson.annotation.JsonCreator; - /** * @author Mark Fisher * @author Artem Bilan @@ -217,7 +216,8 @@ public final class MessageHistory implements List, Serializable { return this.components.lastIndexOf(o); } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) { return true; } @@ -228,7 +228,8 @@ public final class MessageHistory implements List, Serializable { return this.components.equals(that.components); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(this.components); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java index 96e49f90d7..721fffe5fd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ public class MessageHistoryConfigurer implements ManageableSmartLifecycle, BeanF private final Set currentlyTrackedComponents = ConcurrentHashMap.newKeySet(); - private String[] componentNamePatterns = { "*" }; + private String[] componentNamePatterns = {"*"}; private ListableBeanFactory beanFactory; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonNodeWrapperToJsonNodeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonNodeWrapperToJsonNodeConverter.java index 9682a12e67..23c327973b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonNodeWrapperToJsonNodeConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonNodeWrapperToJsonNodeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 the original author or authors. + * Copyright 2021-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ package org.springframework.integration.json; import java.util.Collections; import java.util.Set; +import com.fasterxml.jackson.databind.JsonNode; + import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.GenericConverter; import org.springframework.integration.json.JsonPropertyAccessor.JsonNodeWrapper; import org.springframework.lang.Nullable; -import com.fasterxml.jackson.databind.JsonNode; - /** * The {@link org.springframework.core.convert.converter.Converter} implementation for the conversion * of {@link JsonPropertyAccessor.JsonNodeWrapper} to {@link JsonNode}, diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java index acf843d239..36192d337b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,11 @@ import java.io.IOException; import java.util.AbstractList; import java.util.Iterator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; + import org.springframework.expression.AccessException; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; @@ -27,11 +32,6 @@ import org.springframework.expression.TypedValue; import org.springframework.lang.Nullable; import org.springframework.util.Assert; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; - /** * A SpEL {@link PropertyAccessor} that knows how to read properties from JSON objects. * Uses Jackson {@link JsonNode} API for nested properties access. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/BytesMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/BytesMessageMapper.java index 52e078869c..f4d8b70407 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/BytesMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/BytesMessageMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,8 @@ public interface BytesMessageMapper extends InboundMessageMapper, Outbou } @Override - @NonNull // override + @NonNull + // override Message toMessage(byte[] bytes, @Nullable Map headers); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/metadata/ConcurrentMetadataStore.java b/spring-integration-core/src/main/java/org/springframework/integration/metadata/ConcurrentMetadataStore.java index b1081cd94e..e8bfc3a3d5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/metadata/ConcurrentMetadataStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/metadata/ConcurrentMetadataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.springframework.integration.metadata; - /** * Supports atomic updates to values in the store. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java index e7fa23bb1a..f4824fc7f3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,21 +31,17 @@ import org.springframework.util.Assert; * * @author Mark Fisher * @author Gary Russell + * @author Artem Bilan */ public class MessageSelectorChain implements MessageSelector { - public enum VotingStrategy { ALL, ANY, MAJORITY, MAJORITY_OR_TIE }; - - private volatile VotingStrategy votingStrategy = VotingStrategy.ALL; - private final List selectors = new CopyOnWriteArrayList(); - + private final List selectors = new CopyOnWriteArrayList<>(); /** * Specify the voting strategy for this selector chain. *

The default is {@link VotingStrategy#ALL}. - * * @param votingStrategy The voting strategy. */ public void setVotingStrategy(VotingStrategy votingStrategy) { @@ -55,7 +51,6 @@ public class MessageSelectorChain implements MessageSelector { /** * Add a selector to the end of the chain. - * * @param selector The message selector. */ public void add(MessageSelector selector) { @@ -64,7 +59,6 @@ public class MessageSelectorChain implements MessageSelector { /** * Add a selector to the chain at the specified index. - * * @param index The index. * @param selector The message selector. */ @@ -74,7 +68,6 @@ public class MessageSelectorChain implements MessageSelector { /** * Initialize the selector chain. Removes any existing selectors. - * * @param selectors The message selectors. */ public void setSelectors(List selectors) { @@ -87,7 +80,7 @@ public class MessageSelectorChain implements MessageSelector { /** * Pass the message through the selector chain. Whether the Message is - * {@link #accept(Message) accepted} is based upon the tallied results of + * accepted is based upon the tallied results of * the individual selectors' responses in accordance with this chain's * {@link VotingStrategy}. */ @@ -114,18 +107,18 @@ public class MessageSelectorChain implements MessageSelector { if (accepted == 0) { return false; } - switch (this.votingStrategy) { - case ANY: - return true; - case ALL: - return (accepted == total); - case MAJORITY: - return (2 * accepted) > total; - case MAJORITY_OR_TIE: - return (2 * accepted) >= total; - default: - throw new IllegalArgumentException("unsupported voting strategy " + this.votingStrategy); - } + return switch (this.votingStrategy) { + case ANY -> true; + case ALL -> (accepted == total); + case MAJORITY -> (2 * accepted) > total; + case MAJORITY_OR_TIE -> (2 * accepted) >= total; + }; + } + + public enum VotingStrategy { + + ALL, ANY, MAJORITY, MAJORITY_OR_TIE + } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java index 944878e3d9..4722460918 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; import java.util.stream.Stream; +import com.fasterxml.jackson.core.TreeNode; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.integration.IntegrationPatternType; import org.springframework.integration.channel.ReactiveStreamsSubscribableChannel; @@ -40,10 +43,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import com.fasterxml.jackson.core.TreeNode; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * Base class for Message-splitting handlers. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupFactory.java index b7b1dea15c..43df421299 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupFactory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public interface MessageGroupFactory { * @return the {@link MessageGroup} instance. */ MessageGroup create(Collection> messages, Object groupId, long timestamp, - boolean complete); + boolean complete); /** * Create a {@link MessageGroup} instance based on the provided {@code groupId}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroupFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroupFactory.java index 74dcbf89a1..d3508ec300 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroupFactory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroupFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,7 +87,6 @@ public class SimpleMessageGroupFactory implements MessageGroupFactory { public enum GroupType { LIST { - @Override Collection> get() { return new ArrayList<>(); @@ -96,7 +95,6 @@ public class SimpleMessageGroupFactory implements MessageGroupFactory { }, BLOCKING_QUEUE { - @Override Collection> get() { return new LinkedBlockingQueue<>(); @@ -105,7 +103,6 @@ public class SimpleMessageGroupFactory implements MessageGroupFactory { }, HASH_SET { - @Override Collection> get() { return new LinkedHashSet<>(); @@ -114,7 +111,6 @@ public class SimpleMessageGroupFactory implements MessageGroupFactory { }, SYNCHRONISED_SET { - @Override Collection> get() { return Collections.synchronizedSet(new LinkedHashSet<>()); @@ -123,7 +119,6 @@ public class SimpleMessageGroupFactory implements MessageGroupFactory { }, PERSISTENT { - @Override Collection> get() { return HASH_SET.get(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessageUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessageUtils.java index 0c2e0769ab..6e0272e725 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessageUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/ErrorMessageUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ public final class ErrorMessageUtils { * The context key for the message object. */ public static final String FAILED_MESSAGE_CONTEXT_KEY = "message"; + /** * The context key for the message object. */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java index 5c79b9e2d3..c07cb09ef7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.messaging.converter.MessageConverter; * * @since 2.0 */ -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class SimpleMessageConverter implements MessageConverter, BeanFactoryAware { private volatile InboundMessageMapper inboundMessageMapper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AdviceMessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AdviceMessageJacksonDeserializer.java index 67cacd3c55..b344cb8b7f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AdviceMessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AdviceMessageJacksonDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ package org.springframework.integration.support.json; import java.io.IOException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; + import org.springframework.integration.message.AdviceMessage; import org.springframework.integration.support.MutableMessageHeaders; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonNode; - /** * The {@link MessageJacksonDeserializer} implementation for the {@link AdviceMessage}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java index c1bd80b47d..373ceb9d34 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.Map; import java.util.stream.Collectors; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,9 +39,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * For outbound messages, uses a message-aware Jackson object mapper to render the message * as JSON. For messages with {@code byte[]} payloads, if rendered as JSON, Jackson diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java index a71b2b2008..04718afaf3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/ErrorMessageJacksonDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,14 +18,14 @@ package org.springframework.integration.support.json; import java.io.IOException; -import org.springframework.integration.support.MutableMessageHeaders; -import org.springframework.messaging.Message; -import org.springframework.messaging.support.ErrorMessage; - import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.type.TypeFactory; +import org.springframework.integration.support.MutableMessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; + /** * The {@link MessageJacksonDeserializer} implementation for the {@link ErrorMessage}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJacksonDeserializer.java index db8356889b..93fdc9f8c8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/GenericMessageJacksonDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ package org.springframework.integration.support.json; import java.io.IOException; -import org.springframework.integration.support.MutableMessageHeaders; -import org.springframework.messaging.support.GenericMessage; - import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; +import org.springframework.integration.support.MutableMessageHeaders; +import org.springframework.messaging.support.GenericMessage; + /** * The {@link MessageJacksonDeserializer} implementation for the {@link GenericMessage}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java index 2bee4c18ca..cb6496fa98 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,14 +22,14 @@ import java.io.UncheckedIOException; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.lang.Nullable; -import org.springframework.messaging.Message; -import org.springframework.util.Assert; - import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import org.springframework.lang.Nullable; +import org.springframework.messaging.Message; +import org.springframework.util.Assert; + /** * {@link JsonInboundMessageMapper.JsonMessageParser} implementation that parses JSON messages * and builds a {@link Message} with the specified payload type from provided {@link JsonInboundMessageMapper}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java index c37519dafb..1aaa0894f2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonObjectMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,10 +26,6 @@ import java.net.URL; import java.util.Collection; import java.util.Map; -import org.springframework.integration.mapping.support.JsonHeaders; -import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -40,6 +36,10 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.json.JsonMapper; +import org.springframework.integration.mapping.support.JsonHeaders; +import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; + /** * Jackson 2 JSON-processor (@link https://github.com/FasterXML) * {@linkplain JsonObjectMapper} implementation. @@ -170,7 +170,7 @@ public class Jackson2JsonObjectMapper extends AbstractJacksonJsonObjectMapper javaTypes) { JavaType classType = this.createJavaType(javaTypes, JsonHeaders.TYPE_ID); if (!classType.isContainerType() || classType.isArrayType()) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonUtils.java index 72b8d0f876..8beed4b565 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonUtils.java @@ -24,11 +24,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import org.springframework.integration.message.AdviceMessage; -import org.springframework.integration.support.MutableMessage; -import org.springframework.messaging.support.ErrorMessage; -import org.springframework.messaging.support.GenericMessage; - import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.DatabindContext; import com.fasterxml.jackson.databind.DeserializationConfig; @@ -41,6 +36,11 @@ import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator; import com.fasterxml.jackson.databind.jsontype.TypeIdResolver; import com.fasterxml.jackson.databind.module.SimpleModule; +import org.springframework.integration.message.AdviceMessage; +import org.springframework.integration.support.MutableMessage; +import org.springframework.messaging.support.ErrorMessage; +import org.springframework.messaging.support.GenericMessage; + /** * Utility methods for Jackson. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJacksonSerializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJacksonSerializer.java index 447e1a525b..fe64be28b4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJacksonSerializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageHeadersJacksonSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ package org.springframework.integration.support.json; import java.io.IOException; import java.util.HashMap; -import org.springframework.messaging.MessageHeaders; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.springframework.messaging.MessageHeaders; + /** * A Jackson {@link StdSerializer} implementation to serialize {@link MessageHeaders} * as a {@link HashMap}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJacksonDeserializer.java index cab8f60bb5..97a9114d8e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MessageJacksonDeserializer.java @@ -20,10 +20,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.support.MutableMessageHeaders; -import org.springframework.messaging.Message; -import org.springframework.util.Assert; - import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JavaType; @@ -33,6 +29,10 @@ import com.fasterxml.jackson.databind.deser.std.StdNodeBasedDeserializer; import com.fasterxml.jackson.databind.jsontype.TypeDeserializer; import com.fasterxml.jackson.databind.type.TypeFactory; +import org.springframework.integration.support.MutableMessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.util.Assert; + /** * A Jackson {@link StdNodeBasedDeserializer} extension for {@link Message} implementations. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeSerializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeSerializer.java index c8d7655f80..bc6d57f5c1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeSerializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MimeTypeSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ package org.springframework.integration.support.json; import java.io.IOException; -import org.springframework.util.MimeType; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import org.springframework.util.MimeType; + /** * Simple {@link StdSerializer} extension to represent a {@link MimeType} object in the * target JSON as a plain string. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJacksonDeserializer.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJacksonDeserializer.java index c2bcbf92d0..f13cad4673 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJacksonDeserializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/MutableMessageJacksonDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ package org.springframework.integration.support.json; import java.io.IOException; -import org.springframework.integration.support.MutableMessage; -import org.springframework.integration.support.MutableMessageHeaders; - import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; +import org.springframework.integration.support.MutableMessage; +import org.springframework.integration.support.MutableMessageHeaders; + /** * The {@link MessageJacksonDeserializer} implementation for the {@link MutableMessage}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java index 9c3864a358..201b6db37a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.springframework.util.Assert; + /** * Default implementation of {@link LockRegistry} which uses Masked Hashcode algorithm to obtain locks. * When an instance of this class is created and array of {@link Lock} objects is created. The length of diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagement.java index 0bcd7b70aa..f177e97a05 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagement.java @@ -16,14 +16,14 @@ package org.springframework.integration.support.management; +import io.micrometer.observation.ObservationRegistry; + import org.springframework.beans.factory.DisposableBean; import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.support.management.metrics.MetricsCaptor; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.lang.Nullable; -import io.micrometer.observation.ObservationRegistry; - /** * Base interface for Integration managed components. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptor.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptor.java index 9f9e586455..13631621fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptor.java @@ -19,6 +19,12 @@ package org.springframework.integration.support.management.micrometer; import java.util.concurrent.TimeUnit; import java.util.function.ToDoubleFunction; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Gauge; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.Timer; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.integration.support.management.metrics.CounterFacade; import org.springframework.integration.support.management.metrics.GaugeFacade; @@ -28,12 +34,6 @@ import org.springframework.integration.support.management.metrics.SampleFacade; import org.springframework.integration.support.management.metrics.TimerFacade; import org.springframework.util.Assert; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Gauge; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.Timer; - /** * The Micrometer implementation of {@link MetricsCaptor}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorConfiguration.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorConfiguration.java index 292d4e6076..6ba1e6b506 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorConfiguration.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.support.management.micrometer; +import io.micrometer.core.instrument.MeterRegistry; + import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Bean; @@ -23,8 +25,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Role; import org.springframework.util.ClassUtils; -import io.micrometer.core.instrument.MeterRegistry; - /** * A {@link Configuration} to add a {@link MicrometerMetricsCaptor}. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorImportSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorImportSelector.java index e5a96f6492..ec7d66a0d8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorImportSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsCaptorImportSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 the original author or authors. + * Copyright 2021-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class MicrometerMetricsCaptorImportSelector implements ImportSelector { @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { if (MicrometerMetricsCaptorConfiguration.METER_REGISTRY_PRESENT) { - return new String[]{ MicrometerMetricsCaptorConfiguration.class.getName() }; + return new String[] {MicrometerMetricsCaptorConfiguration.class.getName()}; } else { return new String[0]; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageReceiverContext.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageReceiverContext.java index 7003158ecb..f3bb801de1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageReceiverContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageReceiverContext.java @@ -16,11 +16,11 @@ package org.springframework.integration.support.management.observation; +import io.micrometer.observation.transport.ReceiverContext; + import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import io.micrometer.observation.transport.ReceiverContext; - /** * The {@link ReceiverContext} extension for {@link Message} context. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageRequestReplyReceiverContext.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageRequestReplyReceiverContext.java index b86239f208..c0d4f441f5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageRequestReplyReceiverContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageRequestReplyReceiverContext.java @@ -16,11 +16,11 @@ package org.springframework.integration.support.management.observation; +import io.micrometer.observation.transport.RequestReplyReceiverContext; + import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import io.micrometer.observation.transport.RequestReplyReceiverContext; - /** * The {@link RequestReplyReceiverContext} extension for a {@link Message} contract with inbound gateways. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageSenderContext.java b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageSenderContext.java index d007fe97f0..aab70cc488 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageSenderContext.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/management/observation/MessageSenderContext.java @@ -16,11 +16,11 @@ package org.springframework.integration.support.management.observation; +import io.micrometer.observation.transport.SenderContext; + import org.springframework.integration.support.MutableMessage; import org.springframework.messaging.Message; -import io.micrometer.observation.transport.SenderContext; - /** * The {@link SenderContext} extension for {@link Message} context. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java index c6c70bb4af..94f8d58107 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/utils/PatternMatchUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,8 @@ import java.util.Arrays; */ public final class PatternMatchUtils { - private PatternMatchUtils() { } + private PatternMatchUtils() { + } /** * Pattern match against the supplied patterns ignoring case; also supports negated ('!') diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java index 150ade670e..f2b1c03fef 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -169,16 +169,16 @@ public class ExpressionEvaluatingTransactionSynchronizationProcessor extends Int logger.debug(() -> "Sending expression result message to " + messageChannel + " " + "as part of '" + expressionType + "' transaction synchronization"); Message spelResultMessage; - if (value instanceof Message) { - spelResultMessage = (Message) value; - } - else { - spelResultMessage = - getMessageBuilderFactory() - .withPayload(value) - .copyHeaders(headers) - .build(); - } + if (value instanceof Message) { + spelResultMessage = (Message) value; + } + else { + spelResultMessage = + getMessageBuilderFactory() + .withPayload(value) + .copyHeaders(headers) + .build(); + } try { sendMessage(messageChannel, spelResultMessage); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java index 3a286b63d9..05d277df12 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionException; import org.springframework.transaction.support.AbstractPlatformTransactionManager; import org.springframework.transaction.support.DefaultTransactionStatus; + /** * An implementation of {@link org.springframework.transaction.PlatformTransactionManager} * that provides transaction-like semantics to diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformer.java index a55f6d144a..b9b1116f9a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,6 +47,7 @@ public class PayloadTypeConvertingTransformer extends AbstractPayloadTrans Assert.notNull(converter, "'converter' must not be null"); this.converter = converter; } + /** * Get the configured {@link Converter}. * @return the converter. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java index 4d9a456633..cf06ca7644 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/CoroutinesUtils.java @@ -16,12 +16,12 @@ package org.springframework.integration.util; +import reactor.core.publisher.Mono; + import org.springframework.core.KotlinDetector; import org.springframework.lang.Nullable; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * Additional utilities for working with Kotlin Coroutines. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/IntegrationReactiveUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/util/IntegrationReactiveUtils.java index 42b0f28baa..a27b98aa98 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/IntegrationReactiveUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/IntegrationReactiveUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,11 @@ import java.util.concurrent.locks.LockSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.core.scheduler.Schedulers; +import reactor.util.retry.Retry; import org.springframework.integration.StaticMessageHeaderAccessor; import org.springframework.integration.acks.AckUtils; @@ -33,12 +38,6 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.SubscribableChannel; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.core.scheduler.Schedulers; -import reactor.util.retry.Retry; - /** * Utilities for adapting integration components to/from reactive types. * @@ -80,7 +79,7 @@ public final class IntegrationReactiveUtils { public static Flux> messageSourceToFlux(MessageSource messageSource) { return Mono. >create(monoSink -> - monoSink.onRequest(value -> monoSink.success(messageSource.receive()))) + monoSink.onRequest(value -> monoSink.success(messageSource.receive()))) .doOnSuccess((message) -> { if (message != null) { AckUtils.autoAck(StaticMessageHeaderAccessor.getAcknowledgmentCallback(message)); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/StackTraceUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/util/StackTraceUtils.java index 30b8ae7598..9f3f31d6cf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/StackTraceUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/StackTraceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,8 @@ package org.springframework.integration.util; */ public final class StackTraceUtils { - private StackTraceUtils() { } + private StackTraceUtils() { + } /** * Traverses the stack trace element array looking for instances that contain the first or second diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java index 7586aa5119..7f9d1fbd9c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ public abstract class WhileLockedProcessor { private final LockRegistry lockRegistry; - public WhileLockedProcessor(LockRegistry lockRegistry, Object key) { + public WhileLockedProcessor(LockRegistry lockRegistry, Object key) { this.key = key; this.lockRegistry = lockRegistry; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java index d1767738a2..757ed23a32 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.lang.reflect.Method; import java.time.Duration; import java.util.ArrayList; @@ -52,6 +44,14 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java index 966a684a00..5c27c7b24f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -38,6 +35,9 @@ import org.springframework.integration.support.MutableMessageBuilder; import org.springframework.integration.support.MutableMessageBuilderFactory; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java index 1c52df0486..a2d6e8163a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -52,6 +49,9 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java index c001617b22..933dc7d9d7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/BarrierMessageHandlerTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -59,6 +53,12 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index 8125bd97dc..0e338b9825 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,6 +36,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java index 2e1fdd3e43..f20df2d967 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CountDownLatch; @@ -39,6 +34,11 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Gary Russell @@ -47,8 +47,10 @@ import org.springframework.messaging.MessageHandler; public class CorrelatingMessageBarrierTests { private CorrelatingMessageBarrier barrier; + @Mock private CorrelationStrategy correlationStrategy; + @Mock private ReleaseStrategy releaseStrategy; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java index e179e78f05..b85e9448b1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.aggregator; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import org.junit.Before; import org.junit.Test; @@ -33,6 +26,13 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java index baec6349d3..7918cb24e2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -47,6 +39,14 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandlingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java index 708da477fc..bfe8b71cdb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Before; import org.junit.Test; @@ -28,6 +25,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Header; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer * @author Artem Bilan @@ -54,7 +54,7 @@ public class CorrelationStrategyAdapterTests { public void testCorrelationStrategyAdapterObjectMethod() { MethodInvokingCorrelationStrategy adapter = new MethodInvokingCorrelationStrategy(new SimpleMessageCorrelator(), - ReflectionUtils.findMethod(SimpleMessageCorrelator.class, "getKey", Message.class)); + ReflectionUtils.findMethod(SimpleMessageCorrelator.class, "getKey", Message.class)); adapter.setBeanFactory(mock(BeanFactory.class)); assertThat(adapter.getCorrelationKey(message)).isEqualTo("b"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java index a9db9f2ff7..c318bcdb9c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -33,6 +30,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Alex Peters * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java index 75a706f89a..d0469b7ddf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -36,6 +32,10 @@ import org.springframework.integration.support.AbstractIntegrationMessageBuilder import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Alex Peters * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java index b5eb54c3d3..03e650a732 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Before; import org.junit.Test; @@ -26,6 +23,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Alex Peters * @author Dave Syer @@ -40,7 +40,7 @@ public class ExpressionEvaluatingReleaseStrategyTests { private final SimpleMessageGroup messages = new SimpleMessageGroup("foo"); @Before - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void setup() { for (int i = 0; i < 5; i++) { messages.add(new GenericMessage(i + 1)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java index 5757ad1a73..83316561cd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.List; import java.util.Objects; @@ -27,6 +25,8 @@ import java.util.stream.IntStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; @@ -34,8 +34,7 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -74,8 +73,8 @@ class FluxAggregatorMessageHandlerTests { Flux> window = (Flux>) payload; StepVerifier.create( - window.map(Message::getPayload) - .cast(String.class)) + window.map(Message::getPayload) + .cast(String.class)) .expectNextSequence( IntStream.iterate(0, i -> i + 2) .limit(10) @@ -94,8 +93,8 @@ class FluxAggregatorMessageHandlerTests { window = (Flux>) payload; StepVerifier.create( - window.map(Message::getPayload) - .cast(String.class)) + window.map(Message::getPayload) + .cast(String.class)) .expectNextSequence( IntStream.iterate(1, i -> i + 2) .limit(10) @@ -247,8 +246,8 @@ class FluxAggregatorMessageHandlerTests { Flux> window = (Flux>) result.getPayload(); StepVerifier.create( - window.map(Message::getPayload) - .cast(String.class)) + window.map(Message::getPayload) + .cast(String.class)) .expectNext("0", "1", "2") .expectNext("terminate") .verifyComplete(); @@ -286,8 +285,8 @@ class FluxAggregatorMessageHandlerTests { Flux> window = (Flux>) result.getPayload(); StepVerifier.create( - window.map(Message::getPayload) - .cast(Integer.class)) + window.map(Message::getPayload) + .cast(Integer.class)) .expectNext(0, 1, 2) .verifyComplete(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java index 5d261b5bbb..6e8e0535db 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici */ @@ -37,5 +37,4 @@ public class HeaderAttributeCorrelationStrategyTests { assertThat(correlationStrategy.getCorrelationKey(message)).isEqualTo(testedHeaderValue); } - } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java index e40a0a8fec..ddec02461c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Comparator; import org.junit.Test; @@ -25,6 +23,8 @@ import org.junit.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java index 81c03ee78e..11965c191e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -53,6 +48,11 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java index 113c4f226b..241c3068c6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; @@ -34,6 +31,9 @@ import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Marius Bogoevici * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java index 53d657e7cf..c20bd9daad 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -39,6 +35,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessagingException; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Marius Bogoevici * @author Alex Peters diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java index d40b389442..fbad31db32 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -27,6 +25,8 @@ import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gary Russell @@ -35,7 +35,7 @@ public class ResequencingMessageGroupProcessorTests { private final ResequencingMessageGroupProcessor processor = new ResequencingMessageGroupProcessor(); - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void shouldProcessSequence() { Message prototypeMessage = MessageBuilder.withPayload("foo").setCorrelationId("x").setSequenceNumber(1).setSequenceSize(3).build(); @@ -51,7 +51,7 @@ public class ResequencingMessageGroupProcessorTests { assertThat(processedMessages).contains(message1, message2, message3); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void shouldPartiallProcessIncompleteSequence() { Message prototypeMessage = MessageBuilder.withPayload("foo").setCorrelationId("x").setSequenceNumber(1).setSequenceSize(4).build(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java index de9495f3a2..bb1858f7c2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.store.MessageGroup; @@ -25,6 +23,8 @@ import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java index cbbfbe247f..affc619a69 100755 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artme Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java index 85a9d2f0f7..cb304e7b2c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -33,6 +31,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Alex Peters diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java index baa4e09282..48a00e8cdf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Alex Peters diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorSupportedUseCasesTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorSupportedUseCasesTests.java index ca55bfab65..34570b07dc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorSupportedUseCasesTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorSupportedUseCasesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -31,6 +29,8 @@ import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java index e31d242eda..9010b6f1b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.jupiter.api.Test; @@ -42,6 +40,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java index f2a62cf4c6..a714f3cc47 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Alex Peters * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java index c9391fda40..8add898c44 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.List; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java index 951b4303c8..5a486989ae 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.integration; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author David Liu diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java index 6e8f094f5e..208498ec62 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.scenarios; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -33,6 +31,8 @@ import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests courtesy of Sean Crotty (INT-1093) * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java index 4951166eb0..cbc4de8731 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.scenarios; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -33,6 +31,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artme Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java index e0f8942cae..1eef6a32a9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.scenarios; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; @@ -33,6 +31,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -99,15 +99,15 @@ public class AggregatorWithCustomReleaseStrategyTests { for (int i = 0; i < 600; i++) { this.executor.execute(() -> { - this.inChannel.send(MessageBuilder.withPayload(new Integer[]{ 1, 2, 3, 4, 5, 6, 7, 8 }).build()); + this.inChannel.send(MessageBuilder.withPayload(new Integer[] {1, 2, 3, 4, 5, 6, 7, 8}).build()); latch.countDown(); }); executor.execute(() -> { - this.inChannel.send(MessageBuilder.withPayload(new Integer[]{ 9, 10, 11, 12, 13, 14, 15, 16 }).build()); + this.inChannel.send(MessageBuilder.withPayload(new Integer[] {9, 10, 11, 12, 13, 14, 15, 16}).build()); latch.countDown(); }); executor.execute(() -> { - this.inChannel.send(MessageBuilder.withPayload(new Integer[]{ 17, 18, 19, 20, 21, 22, 23, 24 }).build()); + this.inChannel.send(MessageBuilder.withPayload(new Integer[] {17, 18, 19, 20, 21, 22, 23, 24}).build()); latch.countDown(); }); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java index 9316ebcb8f..a0f33bcd8f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.scenarios; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; @@ -32,6 +30,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java index 14476430b8..a345d3ecc5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aggregator.scenarios; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; @@ -34,6 +32,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java index eda8e8fbd5..359e25d994 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java index 79ce0b5f5d..00152283e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java index 02827712fb..732c3c591e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; @@ -34,6 +32,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.core.DestinationResolver; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java index c5ad8a8693..3f3516e6d7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSourceTests.java index f9f04d6868..0e5f7df80a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MethodAnnotationPublisherMetadataSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Method; @@ -33,6 +31,8 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.util.ReflectionTestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java index 07f62a0295..6a90b03a87 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -34,6 +32,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Jeff Maxwell @@ -233,7 +233,7 @@ public class PublisherAnnotationAdvisorTests { } - @Target({ ElementType.METHOD, ElementType.TYPE }) + @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Publisher(channel = "testMetaChannel") public @interface TestMetaPublisher { @@ -285,7 +285,7 @@ public class PublisherAnnotationAdvisorTests { } - @Target({ ElementType.METHOD, ElementType.TYPE }) + @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @Publisher("testMetaChannel") public @interface TestMetaPublisherViaValue { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java index e2ec5a0967..e256fe3edf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.aop; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,6 +31,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java index d4029b152e..45c882d09c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.bus; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -47,6 +44,9 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index 7cf2da06a4..17708cb970 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.bus; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,6 +37,9 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/CGLibProxyChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/CGLibProxyChannelTests.java index 9f8a7e9053..6cfdc0b18c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/CGLibProxyChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/CGLibProxyChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -37,6 +35,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.3.10 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java index 10d033c570..87e61f4f1c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -25,6 +23,8 @@ import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java index 4d3dcb21bc..9bffead120 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.Date; import java.util.HashSet; @@ -46,6 +44,8 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java index ffa3e0de4e..9ad9dad433 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java index 7aebcd68d7..2075efe129 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.lang.reflect.Method; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -45,6 +39,12 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java index faefa90ea6..cda1f37a73 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +28,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java index b5884cf1e4..a35ce5dcb7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -34,6 +31,9 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java index 36b9719d64..b760e7a0d2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -44,6 +38,12 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor; import org.springframework.scheduling.concurrent.CustomizableThreadFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests.java index 7daf143441..661276ea92 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/FixedSubscriberChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +32,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 4.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/IntegrationReactiveUtilsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/IntegrationReactiveUtilsTests.java index dc13a1378d..922b561feb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/IntegrationReactiveUtilsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/IntegrationReactiveUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -26,12 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; - -import org.springframework.integration.core.MessageSource; -import org.springframework.integration.util.IntegrationReactiveUtils; -import org.springframework.messaging.MessagingException; -import org.springframework.messaging.support.GenericMessage; - import reactor.core.Disposable; import reactor.core.Disposables; import reactor.core.publisher.Mono; @@ -40,6 +32,13 @@ import reactor.core.scheduler.Schedulers; import reactor.test.StepVerifier; import reactor.util.concurrent.Queues; +import org.springframework.integration.core.MessageSource; +import org.springframework.integration.util.IntegrationReactiveUtils; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.GenericMessage; + +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Sergei Egorov * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java index a85575dcd7..3ef7afb118 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; @@ -47,6 +37,16 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java index b954fb965d..4747582456 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.Executor; @@ -34,6 +27,13 @@ import org.springframework.core.log.LogAccessor; import org.springframework.messaging.MessageHandler; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java index e6748d2669..dc12a5f5ee 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Comparator; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -31,6 +29,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/PublishSubscribeChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/PublishSubscribeChannelTests.java index 0b973bfdce..a43669a0cd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/PublishSubscribeChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/PublishSubscribeChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.mock; - import java.util.concurrent.Executor; import org.junit.jupiter.api.Test; @@ -29,6 +25,10 @@ import org.springframework.integration.MessageDispatchingException; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -41,7 +41,8 @@ public class PublishSubscribeChannelTests { @Test public void testEarlySubscribe() { PublishSubscribeChannel channel = new PublishSubscribeChannel(mock(Executor.class)); - channel.subscribe(m -> { }); + channel.subscribe(m -> { + }); channel.setBeanFactory(mock(BeanFactory.class)); assertThatIllegalStateException() .isThrownBy(channel::afterPropertiesSet) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java index c990f38ec9..30a759373d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.spy; - import java.util.ArrayDeque; import java.util.List; import java.util.Queue; @@ -36,6 +32,10 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.spy; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java index 12e5be603a..3c79f45117 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests.java index 3bebfa88f3..499e7b92b3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java index cf83a40f96..01d6e73576 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index d2f438bf31..e43040927a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.Executor; import org.junit.Test; @@ -53,6 +51,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld @@ -63,7 +63,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @ContextConfiguration(locations = { "/org/springframework/integration/channel/config/ChannelParserTests-context.xml", - "/org/springframework/integration/channel/config/priorityChannelParserTests.xml" }) + "/org/springframework/integration/channel/config/priorityChannelParserTests.xml"}) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext public class ChannelParserTests { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests.java index 543d8ebb6f..9399e5b7bc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -31,6 +29,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Testcases for detailed namespace support for <queue/> element under * <channel/> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java index e7374d5588..c8f65a7a14 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Iterator; import java.util.Map; @@ -42,6 +40,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java index 21deddfc58..ca77514e5e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.RendezvousChannel; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java index 283a745862..d392163d3f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -37,6 +35,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java index fe4d9df535..96df941151 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.InterceptableChannel; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -302,6 +302,7 @@ public class ChannelInterceptorTests { .setHeader(this.getClass().getSimpleName(), counter.incrementAndGet()) .build(); } + public String getFoo() { return foo; } @@ -456,11 +457,10 @@ public class ChannelInterceptorTests { @Override public void afterMessageHandled(Message message, MessageChannel channel, MessageHandler handler, - Exception ex) { + Exception ex) { } } - } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java index d9c3002b73..3f6c10155e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java index 596c8930d0..aed74f9932 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -40,6 +38,8 @@ import org.springframework.messaging.support.InterceptableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author David Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java index c4f6ae104f..8f4a3fa811 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author David Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests.java index 2976e7641e..e8a8529349 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ImplicitConsumerChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.messaging.support.InterceptableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java index 122b3b3747..df6d69f09b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; @@ -28,6 +26,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptorTests.java index 2839397691..82f7091baf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ObservationPropagationChannelInterceptorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -25,6 +23,26 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import io.micrometer.common.KeyValues; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import io.micrometer.core.tck.MeterRegistryAssert; +import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationHandler; +import io.micrometer.observation.ObservationRegistry; +import io.micrometer.observation.tck.TestObservationRegistry; +import io.micrometer.observation.tck.TestObservationRegistryAssert; +import io.micrometer.tracing.Span; +import io.micrometer.tracing.TraceContext; +import io.micrometer.tracing.Tracer; +import io.micrometer.tracing.handler.DefaultTracingObservationHandler; +import io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler; +import io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler; +import io.micrometer.tracing.propagation.Propagator; +import io.micrometer.tracing.test.simple.SimpleTracer; +import io.micrometer.tracing.test.simple.SpansAssert; +import io.micrometer.tracing.test.simple.TracerAssert; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -53,26 +71,7 @@ import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import io.micrometer.common.KeyValues; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; -import io.micrometer.core.tck.MeterRegistryAssert; -import io.micrometer.observation.Observation; -import io.micrometer.observation.ObservationHandler; -import io.micrometer.observation.ObservationRegistry; -import io.micrometer.observation.tck.TestObservationRegistry; -import io.micrometer.observation.tck.TestObservationRegistryAssert; -import io.micrometer.tracing.Span; -import io.micrometer.tracing.TraceContext; -import io.micrometer.tracing.Tracer; -import io.micrometer.tracing.handler.DefaultTracingObservationHandler; -import io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler; -import io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler; -import io.micrometer.tracing.propagation.Propagator; -import io.micrometer.tracing.test.simple.SimpleTracer; -import io.micrometer.tracing.test.simple.SpansAssert; -import io.micrometer.tracing.test.simple.TracerAssert; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java index 1f62dc58cc..b6e541917d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.interceptor; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.channel.QueueChannel; @@ -27,6 +25,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/FluxMessageChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/FluxMessageChannelTests.java index 982b5abc18..6c4de15cab 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/FluxMessageChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/FluxMessageChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.channel.reactive; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -26,6 +24,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.Test; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -49,8 +49,7 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/ReactiveStreamsConsumerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/ReactiveStreamsConsumerTests.java index f9c6378312..d9108cf84a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/ReactiveStreamsConsumerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/ReactiveStreamsConsumerTests.java @@ -16,16 +16,6 @@ package org.springframework.integration.channel.reactive; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.awaitility.Awaitility.await; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.time.Duration; import java.util.LinkedList; import java.util.List; @@ -42,6 +32,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; +import reactor.util.Loggers; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; @@ -58,11 +53,15 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.ReactiveMessageHandler; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; -import reactor.util.Loggers; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java index cd86c132ac..bbc89ae923 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.channel.registry; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -50,6 +44,12 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/CompositeCodecTests.java b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/CompositeCodecTests.java index 5d3586d764..616214c2fd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/CompositeCodecTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/CompositeCodecTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.codec.kryo; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -28,6 +26,8 @@ import org.junit.Test; import org.springframework.integration.codec.Codec; import org.springframework.integration.codec.CompositeCodec; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * @since 4.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/FileKryoRegistrarTests.java b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/FileKryoRegistrarTests.java index c2d723e7a7..aff90ff38b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/FileKryoRegistrarTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/FileKryoRegistrarTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.codec.kryo; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/KryoCodecTests.java b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/KryoCodecTests.java index 72de6ea794..34b107b2d4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/KryoCodecTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/codec/kryo/KryoCodecTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.codec.kryo; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -29,6 +27,8 @@ import java.util.Map; import org.assertj.core.data.Offset; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java b/spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java index 4ce51d4e2c..fce492cd90 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/Adder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ public class Adder { public Long add(List results) { long total = 0L; - for (long partialResult: results) { + for (long partialResult : results) { total += partialResult; } return total; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 8b71e3c046..36639f782d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.time.Duration; import java.util.ArrayList; import java.util.Collection; @@ -56,6 +53,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Marius Bogoevici * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java index b86f5a0980..a6f0bb16c7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -36,6 +34,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java index 80a2ae695e..3932af7347 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java index 1a12626bcd..6c442fee9a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java @@ -16,14 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -64,6 +56,14 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Iwein Fuld @@ -312,7 +312,7 @@ public class ChainParserTests { DirectFieldAccessor dfa = new DirectFieldAccessor(handler); dfa.setPropertyValue("messageLogger", logger); - this.loggingChannelAdapterChannel.send(MessageBuilder.withPayload(new byte[]{ 116, 101, 115, 116 }).build()); + this.loggingChannelAdapterChannel.send(MessageBuilder.withPayload(new byte[] {116, 101, 115, 116}).build()); assertThat(log.get()).isNotNull(); assertThat(log.get().get()).isEqualTo("TEST"); } @@ -394,7 +394,7 @@ public class ChainParserTests { //INT-3117 GatewayProxyFactoryBean gatewayProxyFactoryBean = this.beanFactory.getBean("&subComponentsIdSupport1$child.gatewayWithinChain.handler", - GatewayProxyFactoryBean.class); + GatewayProxyFactoryBean.class); assertThat(TestUtils.getPropertyValue(gatewayProxyFactoryBean, "defaultRequestChannelName")) .isEqualTo("strings"); assertThat(TestUtils.getPropertyValue(gatewayProxyFactoryBean, "defaultReplyChannelName")).isEqualTo( diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index 979e9e450b..e8b747bb18 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,6 +38,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -269,7 +269,7 @@ public class ChannelAdapterParserTests { public static class SampleBean { public String getMessage() { - return "hello"; + return "hello"; } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java index 006f5fbf6c..40f30db02a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.TimeUnit; import org.junit.Test; @@ -37,6 +35,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/CorrelationStrategyInvalidConfigurationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/CorrelationStrategyInvalidConfigurationTests.java index 64e870678c..79e021af5f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/CorrelationStrategyInvalidConfigurationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/CorrelationStrategyInvalidConfigurationTests.java @@ -16,13 +16,13 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Marius Bogoevici * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java index 0c0125dfe6..00d02feb6d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.TimeUnit; import org.junit.Test; @@ -26,6 +24,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java index 16329ff1ed..265ef495d1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -36,6 +34,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/GlobalChannelInterceptorProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/GlobalChannelInterceptorProcessorTests.java index b3ef2b8be6..70e305b33d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/GlobalChannelInterceptorProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/GlobalChannelInterceptorProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.config; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -33,6 +29,10 @@ import org.springframework.integration.channel.interceptor.GlobalChannelIntercep import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.InterceptableChannel; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Meherzad Lahewala * @@ -95,7 +95,7 @@ public class GlobalChannelInterceptorProcessorTests { InterceptableChannel channel = Mockito.mock(InterceptableChannel.class); - globalChannelInterceptorWrapper.setPatterns(new String[] { "Te*" }); + globalChannelInterceptorWrapper.setPatterns(new String[] {"Te*"}); interceptors.put("Test-1", globalChannelInterceptorWrapper); channels.put("Test-1", channel); when(this.beanFactory.getBeansOfType(GlobalChannelInterceptorWrapper.class)) @@ -118,7 +118,7 @@ public class GlobalChannelInterceptorProcessorTests { InterceptableChannel channel = Mockito.mock(InterceptableChannel.class); - globalChannelInterceptorWrapper.setPatterns(new String[] { "te*" }); + globalChannelInterceptorWrapper.setPatterns(new String[] {"te*"}); interceptors.put("Test-1", globalChannelInterceptorWrapper); channels.put("Test-1", channel); when(this.beanFactory.getBeansOfType(GlobalChannelInterceptorWrapper.class)) @@ -142,7 +142,7 @@ public class GlobalChannelInterceptorProcessorTests { InterceptableChannel channel = Mockito.mock(InterceptableChannel.class); - globalChannelInterceptorWrapper.setPatterns(new String[] { "!te*", "!Te*" }); + globalChannelInterceptorWrapper.setPatterns(new String[] {"!te*", "!Te*"}); interceptors.put("Test-1", globalChannelInterceptorWrapper); channels.put("Test-1", channel); when(this.beanFactory.getBeansOfType(GlobalChannelInterceptorWrapper.class)) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/IdGeneratorConfigurerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/IdGeneratorConfigurerTests.java index 1aa1de7396..1d6c1af8be 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/IdGeneratorConfigurerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/IdGeneratorConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; @@ -33,6 +30,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageHeaders; import org.springframework.util.IdGenerator; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Gary Russell * @author Artem Bilan @@ -91,7 +91,8 @@ public class IdGeneratorConfigurerTests { @Test public void testTwoContextsSameClass() { - try (GenericApplicationContext context = new GenericApplicationContext(); + try ( + GenericApplicationContext context = new GenericApplicationContext(); GenericApplicationContext context2 = new GenericApplicationContext()) { context.registerBeanDefinition("bfpp", @@ -154,7 +155,8 @@ public class IdGeneratorConfigurerTests { @Test public void testTwoContextDifferentClass() { - try (GenericApplicationContext context = new GenericApplicationContext(); + try ( + GenericApplicationContext context = new GenericApplicationContext(); GenericApplicationContext context2 = new GenericApplicationContext()) { context.registerBeanDefinition("bfpp", new RootBeanDefinition(DefaultConfiguringBeanFactoryPostProcessor.class)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelParserTests.java index 5d3887eb3a..9d5056265e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidPriorityChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Dave Syer * @author Manuel Jordan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelParserTests.java index cf7e9f6f56..b07e8b1ab0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/InvalidQueueChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Dave Syer * @author Manuel Jordan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueReleaseStrategy.java b/spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueReleaseStrategy.java index ffefb6ec60..4c3372b6da 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueReleaseStrategy.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/MaxValueReleaseStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class MaxValueReleaseStrategy { public boolean checkCompletenessAsList(List numbers) { int sum = 0; - for (long number: numbers) { + for (long number : numbers) { sum += number; } return sum >= maxValue; @@ -38,7 +38,7 @@ public class MaxValueReleaseStrategy { public boolean checkCompletenessAsCollection(Collection numbers) { int sum = 0; - for (long number: numbers) { + for (long number : numbers) { sum += number; } return sum >= maxValue; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index 4f78068507..e09767af54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; @@ -32,6 +30,8 @@ import org.springframework.integration.support.channel.BeanFactoryChannelResolve import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java index 8a19bb11cc..8206f696e9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.Executor; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell @@ -52,7 +52,8 @@ public class PublishSubscribeChannelParserTests { BroadcastingDispatcher dispatcher = (BroadcastingDispatcher) accessor.getPropertyValue("dispatcher"); dispatcher.setApplySequence(true); - dispatcher.addHandler(message -> { }); + dispatcher.addHandler(message -> { + }); dispatcher.dispatch(new GenericMessage<>("foo")); DirectFieldAccessor dispatcherAccessor = new DirectFieldAccessor(dispatcher); assertThat(dispatcherAccessor.getPropertyValue("executor")).isNull(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyFactoryBeanTests.java index 9c88a79efb..c5145f0d9f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ReleaseStrategyFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Collection; import org.junit.Test; @@ -29,6 +26,9 @@ import org.springframework.integration.aggregator.SimpleSequenceSizeReleaseStrat import org.springframework.integration.store.MessageGroup; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index 13565920f1..00072465b6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.integration.test.util.TestUtils.getPropertyValue; - import java.util.List; import org.junit.jupiter.api.Test; @@ -38,6 +35,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.util.TestUtils.getPropertyValue; + /** * @author Marius Bogoevici * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java index ae7f917df5..9458489f88 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java index 7b86e51972..beab4095ed 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java index 7a4042674d..dec79d7382 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java index 44e4509e68..faa0a707f2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -32,6 +30,8 @@ import org.springframework.integration.test.util.TestUtils.TestApplicationContex import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java index de626618be..714b479ee4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java @@ -16,17 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - import java.time.Duration; import java.util.ArrayList; import java.util.List; @@ -64,6 +53,17 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.ClassUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java index 6329f1ec32..f4ad39c40c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class TestAggregatorBean { correlationId = new IntegrationMessageHeaderAccessor(message).getCorrelationId(); } } - Message returnedMessage = new GenericMessage<>(buffer.toString()); + Message returnedMessage = new GenericMessage<>(buffer.toString()); if (correlationId != null) { this.aggregatedMessages.put(correlationId, returnedMessage); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java index 9de0e5eb02..82a92c0039 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java index 794cff69ee..86c85b28d3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -36,6 +34,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index 522f012289..e212c61846 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.integration.test.util.TestUtils.getPropertyValue; - import java.lang.reflect.Method; import org.junit.Test; @@ -34,6 +31,9 @@ import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.util.TestUtils.getPropertyValue; + /** * @author Marius Bogoevici * @author Mark Fisher @@ -45,7 +45,7 @@ public class AggregatorAnnotationTests { @Test public void testAnnotationWithDefaultSettings() { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( - new String[] { "classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml" }); + new String[] {"classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml"}); final String endpointName = "endpointWithDefaultAnnotation"; MessageHandler aggregator = this.getAggregator(context, endpointName); assertThat(getPropertyValue(aggregator, "releaseStrategy") instanceof SimpleSequenceSizeReleaseStrategy) @@ -59,7 +59,7 @@ public class AggregatorAnnotationTests { @Test public void testAnnotationWithCustomSettings() { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( - new String[] { "classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml" }); + new String[] {"classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml"}); final String endpointName = "endpointWithCustomizedAnnotation"; MessageHandler aggregator = this.getAggregator(context, endpointName); assertThat(getPropertyValue(aggregator, "releaseStrategy") instanceof SimpleSequenceSizeReleaseStrategy) @@ -74,7 +74,7 @@ public class AggregatorAnnotationTests { @Test public void testAnnotationWithCustomReleaseStrategy() throws Exception { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( - new String[] { "classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml" }); + new String[] {"classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml"}); final String endpointName = "endpointWithDefaultAnnotationAndCustomReleaseStrategy"; MessageHandler aggregator = this.getAggregator(context, endpointName); Object releaseStrategy = getPropertyValue(aggregator, "releaseStrategy"); @@ -92,7 +92,7 @@ public class AggregatorAnnotationTests { @Test public void testAnnotationWithCustomCorrelationStrategy() throws Exception { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( - new String[] { "classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml" }); + new String[] {"classpath:/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml"}); final String endpointName = "endpointWithCorrelationStrategy"; MessageHandler aggregator = this.getAggregator(context, endpointName); Object correlationStrategy = getPropertyValue(aggregator, "correlationStrategy"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java index b020333289..cf44981638 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.BeforeEach; @@ -37,6 +34,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/BridgeFromIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/BridgeFromIntegrationTests.java index d6b2537a0d..b35dce4754 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/BridgeFromIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/BridgeFromIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +35,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -69,7 +69,7 @@ public class BridgeFromIntegrationTests { basePackageClasses = BridgeFromIntegrationTests.class, useDefaultFilters = false, includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, - classes = { AnnotatedTestService.class, ScannedTestConfiguration.class })) + classes = {AnnotatedTestService.class, ScannedTestConfiguration.class})) public static class RootTestConfiguration { } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/CustomMessagingAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/CustomMessagingAnnotationTests.java index 6338ef8cca..3bfe40c139 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/CustomMessagingAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/CustomMessagingAnnotationTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.lang.annotation.Annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -58,6 +53,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Artem Bilan * @@ -119,7 +119,7 @@ public class CustomMessagingAnnotationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @Inherited @Documented diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java index 45150a0cc8..e894d5026e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.util.Collections; import java.util.List; @@ -39,6 +36,9 @@ import org.springframework.integration.test.util.TestUtils.TestApplicationContex import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + /** * @author Mark Fisher * @author Gary Russell @@ -113,7 +113,7 @@ public class FilterAnnotationPostProcessorTests { @Test public void filterAnnotationWithAdviceArray() { TestAdvice advice = new TestAdvice(); - context.registerBean("adviceChain", new TestAdvice[]{ advice }); + context.registerBean("adviceChain", new TestAdvice[] {advice}); testValidFilter(new TestFilterWithAdviceDiscardWithin()); EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("testFilter.filter.filter"); assertThat(TestUtils.getPropertyValue(endpoint, "handler.adviceChain", List.class).get(0)).isSameAs(advice); @@ -124,10 +124,10 @@ public class FilterAnnotationPostProcessorTests { public void filterAnnotationWithAdviceArrayTwice() { TestAdvice advice1 = new TestAdvice(); TestAdvice advice2 = new TestAdvice(); - context.registerBean("adviceChain1", new TestAdvice[]{ advice1, advice2 }); + context.registerBean("adviceChain1", new TestAdvice[] {advice1, advice2}); TestAdvice advice3 = new TestAdvice(); TestAdvice advice4 = new TestAdvice(); - context.registerBean("adviceChain2", new TestAdvice[]{ advice3, advice4 }); + context.registerBean("adviceChain2", new TestAdvice[] {advice3, advice4}); testValidFilter(new TestFilterWithAdviceDiscardWithinTwice()); EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("testFilter.filter.filter"); List adviceList = TestUtils.getPropertyValue(endpoint, "handler.adviceChain", List.class); @@ -153,10 +153,10 @@ public class FilterAnnotationPostProcessorTests { public void filterAnnotationWithAdviceCollectionTwice() { TestAdvice advice1 = new TestAdvice(); TestAdvice advice2 = new TestAdvice(); - context.registerBean("adviceChain1", new TestAdvice[]{ advice1, advice2 }); + context.registerBean("adviceChain1", new TestAdvice[] {advice1, advice2}); TestAdvice advice3 = new TestAdvice(); TestAdvice advice4 = new TestAdvice(); - context.registerBean("adviceChain2", new TestAdvice[]{ advice3, advice4 }); + context.registerBean("adviceChain2", new TestAdvice[] {advice3, advice4}); testValidFilter(new TestFilterWithAdviceDiscardWithinTwice()); EventDrivenConsumer endpoint = (EventDrivenConsumer) context.getBean("testFilter.filter.filter"); List adviceList = TestUtils.getPropertyValue(endpoint, "handler.adviceChain", List.class); @@ -223,7 +223,7 @@ public class FilterAnnotationPostProcessorTests { @MessageEndpoint public static class TestFilterWithAdviceDiscardWithinTwice { - @Filter(inputChannel = "input", outputChannel = "output", adviceChain = { "adviceChain1", "adviceChain2" }) + @Filter(inputChannel = "input", outputChannel = "output", adviceChain = {"adviceChain1", "adviceChain2"}) public boolean filter(String s) { return !s.contains("bad"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java index 445d52c6da..6bb51d681a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicInteger; import org.aspectj.lang.annotation.Aspect; @@ -36,6 +34,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index b730e522ad..b12505c12e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -51,6 +49,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell @@ -401,7 +401,7 @@ public class MessagingAnnotationPostProcessorTests { } - @Target({ ElementType.METHOD }) + @Target({ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @ServiceActivator(inputChannel = "eventBus") public @interface EventHandler { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationsWithBeanAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationsWithBeanAnnotationTests.java index 3f2a781902..599dff2b96 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationsWithBeanAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationsWithBeanAnnotationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -30,6 +27,10 @@ import java.util.function.Supplier; import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -84,10 +85,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Artem Bilan @@ -297,7 +296,7 @@ public class MessagingAnnotationsWithBeanAnnotationTests { } @Bean - @Router(inputChannel = "routerChannel", channelMappings = { "true=odd", "false=filter" }, suffix = "Channel") + @Router(inputChannel = "routerChannel", channelMappings = {"true=odd", "false=filter"}, suffix = "Channel") public MessageSelector router() { return new ExpressionEvaluatingSelector("payload % 2 == 0"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java index 5ff98a78ec..9baae7bc94 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.List; @@ -36,6 +34,8 @@ import org.springframework.integration.test.util.TestUtils.TestApplicationContex import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan @@ -57,7 +57,6 @@ public class RouterAnnotationPostProcessorTests { private final QueueChannel stringChannel = new QueueChannel(); - @BeforeEach public void init() { context.registerChannel("input", inputChannel); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java index 0946e178fa..abe52ccb35 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,6 +33,8 @@ import org.springframework.integration.test.util.TestUtils.TestApplicationContex import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java index b571932289..0d0ace7c37 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.annotation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -38,6 +36,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java index 7c41b4e106..b3d8e33be8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class TestAnnotatedEndpointWithDefaultAggregator { correlationId = new IntegrationMessageHeaderAccessor(message).getCorrelationId(); } } - Message returnedMessage = new GenericMessage<>(buffer.toString()); + Message returnedMessage = new GenericMessage<>(buffer.toString()); this.aggregatedMessages.put(correlationId, returnedMessage); return returnedMessage; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java index e891306aa5..e270362689 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class TestAnnotatedEndpointWithReleaseStrategy { correlationId = new IntegrationMessageHeaderAccessor(message).getCorrelationId(); } } - Message returnedMessage = new GenericMessage<>(buffer.toString()); + Message returnedMessage = new GenericMessage<>(buffer.toString()); this.aggregatedMessages.put(correlationId, returnedMessage); return returnedMessage; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java index 30e85ceba5..a9cc6d916d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BarrierParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +34,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java index 07edfdc358..57098dcfc9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; @@ -37,6 +35,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java index 7e42a004a2..bc1fa3e2b6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChainElementsFailureTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.util.Locale; import java.util.Properties; @@ -36,6 +33,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java index df9f101cf0..f46a82cbf2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; + /** * * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java index 898164dfc5..a2f6c9cdf4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.UUID; import org.junit.Test; @@ -38,6 +36,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests.java index f896b8108f..f089a12dc1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ContextHierarchyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Before; import org.junit.Test; @@ -25,6 +23,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ @@ -40,7 +40,7 @@ public class ContextHierarchyTests { String prefix = "/org/springframework/integration/config/xml/ContextHierarchyTests-"; this.parentContext = new ClassPathXmlApplicationContext(prefix + "parent.xml"); this.childContext = new ClassPathXmlApplicationContext( - new String[] { prefix + "child.xml" }, parentContext); + new String[] {prefix + "child.xml"}, parentContext); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java index 3fdb4b8d36..002f055a32 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import org.junit.Test; @@ -33,6 +31,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java index 316226bbb9..cd57331bef 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java index 2bac2f0463..668d0460d0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests.java index f2f241676b..997478f166 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusRecipientListRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -40,6 +38,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Liujiong * @since 4.1 @@ -63,7 +64,7 @@ public class ControlBusRecipientListRouterTests { private MessageChannel channel; @Before - public void aa() { + public void aa() { context.start(); } @@ -72,7 +73,7 @@ public class ControlBusRecipientListRouterTests { MessagingTemplate messagingTemplate = new MessagingTemplate(); messagingTemplate.setReceiveTimeout(1000); messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.addRecipient('channel2','true')"); - Message message = new GenericMessage(1); + Message message = new GenericMessage(1); channel.send(message); PollableChannel chanel2 = (PollableChannel) context.getBean("channel2"); assertThat(chanel2.receive(0).getPayload().equals(1)).isTrue(); @@ -84,7 +85,7 @@ public class ControlBusRecipientListRouterTests { messagingTemplate.setReceiveTimeout(1000); messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.addRecipient('channel3')"); - Message message = new GenericMessage(1); + Message message = new GenericMessage(1); channel.send(message); PollableChannel chanel3 = (PollableChannel) context.getBean("channel3"); assertThat(chanel3.receive(0).getPayload().equals(1)).isTrue(); @@ -98,7 +99,7 @@ public class ControlBusRecipientListRouterTests { messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.addRecipient('channel4')"); messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.removeRecipient('channel4')"); - Message message = new GenericMessage(1); + Message message = new GenericMessage(1); channel.send(message); PollableChannel chanel1 = (PollableChannel) context.getBean("channel1"); PollableChannel chanel4 = (PollableChannel) context.getBean("channel4"); @@ -114,7 +115,7 @@ public class ControlBusRecipientListRouterTests { messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.addRecipient('channel5','true')"); messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.removeRecipient('channel5','true')"); - Message message = new GenericMessage(1); + Message message = new GenericMessage(1); channel.send(message); PollableChannel chanel1 = (PollableChannel) context.getBean("channel1"); PollableChannel chanel5 = (PollableChannel) context.getBean("channel5"); @@ -156,7 +157,7 @@ public class ControlBusRecipientListRouterTests { messagingTemplate.setReceiveTimeout(1000); messagingTemplate.convertAndSend(input, "@'simpleRouter.handler'.replaceRecipients('channel7=true')"); - Message message = new GenericMessage(1); + Message message = new GenericMessage(1); channel.send(message); PollableChannel chanel7 = (PollableChannel) context.getBean("channel7"); assertThat(chanel7.receive(0).getPayload().equals(1)).isTrue(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java index 723b758de7..04b0c2602c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.util.Date; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -41,6 +38,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * @author Dave Syer * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java index 7ec1162812..95db0925ac 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java index d2d4190287..8ba9421b2d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +31,8 @@ import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky @@ -57,6 +57,7 @@ public class ConverterParserWithExistingConversionServiceTests { assertThat(conversionService.canConvert(TestBean1.class, TestBean2.class)).isTrue(); assertThat(conversionService.canConvert(TestBean1.class, TestBean3.class)).isTrue(); } + @Test public void testParentConversionServiceAvailability() { ClassPathXmlApplicationContext parentContext = new ClassPathXmlApplicationContext( @@ -83,7 +84,7 @@ public class ConverterParserWithExistingConversionServiceTests { } - private static class TestBean1 { + private static class TestBean1 { private final String text; @@ -110,6 +111,7 @@ public class ConverterParserWithExistingConversionServiceTests { } } + private static class TestBean3 { private final String text; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java index 5a509c449f..5c6c0bb6c0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/CronTriggerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.scheduling.support.CronTrigger; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java index 8372a18c92..186f378c87 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorHierarchyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; @@ -26,6 +24,8 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.integration.context.IntegrationContextUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java index 3cab6c2d4e..79de39d7ff 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -36,6 +34,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -84,10 +84,10 @@ public class DefaultConfiguringBeanFactoryPostProcessorTests { ClassPathXmlApplicationContext superParentApplicationContext = new ClassPathXmlApplicationContext( "superParentApplicationContext.xml", this.getClass()); ClassPathXmlApplicationContext parentApplicationContext = new ClassPathXmlApplicationContext( - new String[] { "org/springframework/integration/config/xml/parentApplicationContext.xml" }, + new String[] {"org/springframework/integration/config/xml/parentApplicationContext.xml"}, superParentApplicationContext); ClassPathXmlApplicationContext childApplicationContext = new ClassPathXmlApplicationContext( - new String[] { "org/springframework/integration/config/xml/childApplicationContext.xml" }, + new String[] {"org/springframework/integration/config/xml/childApplicationContext.xml"}, parentApplicationContext); TaskScheduler parentScheduler = childApplicationContext.getParent().getBean("taskScheduler", TaskScheduler.class); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests.java index 8af967bf70..7f0b6f1504 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DefaultOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; @@ -38,6 +36,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java index 96950cbf29..5aaef42a1b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.HashMap; import java.util.List; @@ -41,6 +39,8 @@ import org.springframework.transaction.interceptor.NameMatchTransactionAttribute import org.springframework.transaction.interceptor.TransactionAttributeSource; import org.springframework.transaction.interceptor.TransactionInterceptor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java index c23bd6251e..79fe3e0dd9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.withinPercentage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +30,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.withinPercentage; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java index a08a6b8a0d..c6a97372dc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -47,6 +43,10 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java index ea713e94a9..277dfda4fc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +24,9 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 2.2 @@ -47,9 +47,11 @@ public class DispatcherMaxSubscribersOverrideDefaultTests extends DispatcherMaxS @Test public void testExceed() { - oneSub.subscribe(message -> { }); + oneSub.subscribe(message -> { + }); try { - oneSub.subscribe(message -> { }); + oneSub.subscribe(message -> { + }); fail("Expected Exception"); } catch (IllegalArgumentException e) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java index f33ec4f869..485c276de3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests.java index 7f489f6979..7d30c9ed2f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.integration.support.SmartLifecycleRoleController; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -112,7 +112,8 @@ public class EndpointRoleParserTests { public static class Sink { - public void foo(String s) { } + public void foo(String s) { + } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java index a952eb6f54..0a4c3eb9df 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -44,6 +42,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java index b4979c797a..8456e23e3e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests2.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java index 7167a7c1d8..58846801b9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -29,6 +26,9 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @@ -46,7 +46,7 @@ public class EnricherParserTests3 { assertThat(payload.getNested().getValue()).isEqualTo("foo"); beanResolveIn.send(new GenericMessage(payload)); @SuppressWarnings("unchecked") - Message out = (Message) beanResolveOut.receive(); + Message out = (Message) beanResolveOut.receive(); assertThat(out.getPayload()).isSameAs(payload); assertThat(out.getPayload().getNested().getValue()).isEqualTo("bar"); context.close(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java index 7a8d82f89a..8458c3bbf3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests4.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Liujiong * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java index 0c8fe3b080..ee7ffa71b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests5.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests the error-channel in an enricher to produce * a default object in case of downstream failure. diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java index 0e4ac7499f..0558a09d96 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -37,6 +35,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java index dd0894f3a2..28ce07d694 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -39,6 +37,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java index 927c5a8368..325da3d448 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java index c4dd59ffb3..313e2f144f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java index 59421a5a1b..45c9b1eeee 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.time.Duration; import java.util.Map; import java.util.concurrent.Callable; @@ -33,6 +28,9 @@ import java.util.function.Supplier; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanNameAware; @@ -63,9 +61,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java index 54a3572507..0a429e28db 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -33,6 +31,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java index 45d162b853..88f3e69a2d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java index da1f252567..0fb6fc76a2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +29,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java index 86114aa697..7a852b4969 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.Date; import java.util.List; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java index 789b6d95d8..236a8acee3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdempotentReceiverParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdempotentReceiverParserTests.java index 08eed3ada9..3f4041d0b7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdempotentReceiverParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdempotentReceiverParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.springframework.integration.test.util.TestUtils.getPropertyValue; - import java.io.ByteArrayInputStream; import java.util.List; import java.util.Map; @@ -50,6 +46,10 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.springframework.integration.test.util.TestUtils.getPropertyValue; + /** * @author Artem Bilan * @since 4.1 @@ -99,7 +99,7 @@ public class IdempotentReceiverParserTests { @SuppressWarnings("unchecked") Map> idempotentEndpoints = getPropertyValue(this.idempotentReceiverAutoProxyCreator, - "idempotentEndpoints", Map.class); + "idempotentEndpoints", Map.class); List endpoints = idempotentEndpoints.get("selectorInterceptor"); assertThat(endpoints).isNotNull(); assertThat(endpoints.isEmpty()).isFalse(); @@ -118,7 +118,7 @@ public class IdempotentReceiverParserTests { @SuppressWarnings("unchecked") Map> idempotentEndpoints = getPropertyValue(this.idempotentReceiverAutoProxyCreator, - "idempotentEndpoints", Map.class); + "idempotentEndpoints", Map.class); List endpoints = idempotentEndpoints.get("strategyInterceptor"); assertThat(endpoints).isNotNull(); assertThat(endpoints.isEmpty()).isFalse(); @@ -136,7 +136,7 @@ public class IdempotentReceiverParserTests { @SuppressWarnings("unchecked") Map> idempotentEndpoints = getPropertyValue(this.idempotentReceiverAutoProxyCreator, - "idempotentEndpoints", Map.class); + "idempotentEndpoints", Map.class); List endpoints = idempotentEndpoints.get("expressionInterceptor"); assertThat(endpoints).isNotNull(); assertThat(endpoints.isEmpty()).isFalse(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java index 8c19442842..fa68c91f3a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterExpressionTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Map; @@ -35,6 +33,8 @@ import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java index ce4da69679..6be5dd642e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InboundChannelAdapterWithDefaultPollerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import org.junit.jupiter.api.Test; @@ -29,6 +27,8 @@ import org.springframework.scheduling.Trigger; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java index f1f05cc96d..0ddcddc79a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerBeanConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java index dbdfbd6fc8..7b7e3a9745 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.ByteArrayInputStream; import java.util.Arrays; import java.util.Collection; @@ -48,6 +45,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -212,7 +212,7 @@ public class InnerDefinitionHandlerAwareEndpointParserTests { bootStrap(configProperty); EventDrivenConsumer splitter = this.applicationContext.getBean("testSplitter", EventDrivenConsumer.class); assertThat(splitter).isNotNull(); - MessageBuilder inChannelMessageBuilder = MessageBuilder.withPayload(new String[]{ "One", "Two" }); + MessageBuilder inChannelMessageBuilder = MessageBuilder.withPayload(new String[] {"One", "Two"}); Message inMessage = inChannelMessageBuilder.build(); MessageChannel inChannel = this.applicationContext.getBean("inChannel", MessageChannel.class); inChannel.send(inMessage); @@ -226,7 +226,7 @@ public class InnerDefinitionHandlerAwareEndpointParserTests { bootStrap(configProperty); EventDrivenConsumer transformer = this.applicationContext.getBean("testTransformer", EventDrivenConsumer.class); assertThat(transformer).isNotNull(); - MessageBuilder inChannelMessageBuilder = MessageBuilder.withPayload(new String[]{ "One", "Two" }); + MessageBuilder inChannelMessageBuilder = MessageBuilder.withPayload(new String[] {"One", "Two"}); Message inMessage = inChannelMessageBuilder.build(); DirectChannel inChannel = this.applicationContext.getBean("inChannel", DirectChannel.class); inChannel.send(inMessage); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests.java index 5ac3da0907..e9112b434b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import org.junit.jupiter.api.Test; @@ -28,6 +26,8 @@ import org.springframework.scheduling.Trigger; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java index 3777da8813..8747bfd277 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/LoggingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +29,9 @@ import org.springframework.integration.handler.LoggingHandler; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java index 03f904641d..00f9522dc1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -36,6 +34,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky @@ -47,6 +47,7 @@ public class MapToObjectTransformerParserTests { @Autowired @Qualifier("input") private MessageChannel input; + @Autowired @Qualifier("output") private PollableChannel output; @@ -54,11 +55,12 @@ public class MapToObjectTransformerParserTests { @Autowired @Qualifier("inputA") private MessageChannel inputA; + @Autowired @Qualifier("outputA") private PollableChannel outputA; - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testMapToObjectTransformationWithType() { Map map = new HashMap(); @@ -82,7 +84,7 @@ public class MapToObjectTransformerParserTests { assertThat(person.getAddress().getStreet()).isEqualTo("1123 Main st"); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testMapToObjectTransformationWithRef() { Map map = new HashMap(); @@ -94,7 +96,7 @@ public class MapToObjectTransformerParserTests { Message message = MessageBuilder.withPayload(map).build(); inputA.send(message); - Message newMessage = outputA.receive(); + Message newMessage = outputA.receive(); Person person = (Person) newMessage.getPayload(); assertThat(person).isNotNull(); assertThat(person.getFname()).isEqualTo("Justin"); @@ -105,7 +107,7 @@ public class MapToObjectTransformerParserTests { } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testMapToObjectTransformationWithConversionService() { Map map = new HashMap(); @@ -124,6 +126,7 @@ public class MapToObjectTransformerParserTests { assertThat(person.getAddress()).isNotNull(); assertThat(person.getAddress().getStreet()).isEqualTo("1123 Main st"); } + @Test(expected = BeanCreationException.class) public void testNonPrototypeFailure() { new ClassPathXmlApplicationContext("MapToObjectTransformerParserTests-context-fail.xml", @@ -132,30 +135,41 @@ public class MapToObjectTransformerParserTests { public static class Person { private String fname; + private String lname; + private String ssn; + private Address address; + public String getSsn() { return ssn; } + public void setSsn(String ssn) { this.ssn = ssn; } + public String getFname() { return fname; } + public void setFname(String fname) { this.fname = fname; } + public String getLname() { return lname; } + public void setLname(String lname) { this.lname = lname; } + public Address getAddress() { return address; } + public void setAddress(Address address) { this.address = address; } @@ -174,7 +188,9 @@ public class MapToObjectTransformerParserTests { } public static class StringToAddressConverter implements Converter { - public StringToAddressConverter() { } + public StringToAddressConverter() { + } + @Override public Address convert(String source) { Address address = new Address(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java index 36ac36d67d..9d0911ab61 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java index d5e18e1152..fc8bbe3058 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Ignore; @@ -32,6 +30,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java index 5a28955231..334fcc2ab8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -41,6 +38,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -120,7 +120,7 @@ public class ObjectToMapTransformerParserTests { assertThat(transformedMap.get("departments")).isInstanceOf(List.class); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public Employee buildEmployee() { Address companyAddress = new Address(); companyAddress.setCity("Philadelphia"); @@ -128,8 +128,8 @@ public class ObjectToMapTransformerParserTests { companyAddress.setZip("12345"); Map coordinates = new HashMap<>(); - coordinates.put("latitude", new Integer[]{ 1, 5, 13 }); - coordinates.put("longitude", new Integer[]{ 156 }); + coordinates.put("latitude", new Integer[] {1, 5, 13}); + coordinates.put("longitude", new Integer[] {156}); companyAddress.setCoordinates(coordinates); Employee employee = new Employee(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java index a57b76189f..00474a802b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +31,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java index c798e18fe2..9fde976703 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.core.Ordered; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @since 1.0.3 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java index 34d5e32d1c..04d517a9c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PNamespaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -31,6 +29,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Validates the "p:namespace" is working for inner "bean" definition within SI components. * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java index ad059477b0..b4faec55b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -43,6 +40,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java index 46773646f4..a22b43032e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -38,6 +36,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java index 66d423bbef..681aeb9027 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.time.temporal.ChronoUnit; import java.util.HashMap; @@ -35,6 +32,9 @@ import org.springframework.transaction.interceptor.NameMatchTransactionAttribute import org.springframework.transaction.interceptor.TransactionAttributeSource; import org.springframework.transaction.interceptor.TransactionInterceptor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java index 1f08c806ac..c54409027b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -36,6 +31,11 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java index 290fa5f2a9..14af861863 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -33,6 +27,12 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests.java index 9b763dc23e..757723f209 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.retry.backoff.FixedBackOffPolicy; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java index f06ed47f55..f4b111cbd5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +32,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/StreamTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/StreamTransformerParserTests.java index b35eb27e17..0870fc1f22 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/StreamTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/StreamTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java index 1cf74f4194..a7fa40b13a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.Map; @@ -32,6 +30,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java index e54f789996..352fa82547 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,6 +26,9 @@ import org.springframework.integration.transaction.DefaultTransactionSynchroniza import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; import org.springframework.integration.transaction.TransactionSynchronizationProcessor; import org.springframework.messaging.MessageChannel; + +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java index 86077f847e..770060a3bb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java @@ -16,14 +16,6 @@ package org.springframework.integration.configuration; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -41,6 +33,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.FactoryBean; @@ -145,8 +139,13 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ClassUtils; import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; /** * @author Artem Bilan @@ -157,8 +156,8 @@ import reactor.core.publisher.Mono; * @since 4.0 */ @ContextConfiguration(loader = NoBeansOverrideAnnotationConfigContextLoader.class) -@SpringJUnitConfig(classes = { EnableIntegrationTests.ContextConfiguration.class, - EnableIntegrationTests.ContextConfiguration2.class }) +@SpringJUnitConfig(classes = {EnableIntegrationTests.ContextConfiguration.class, + EnableIntegrationTests.ContextConfiguration2.class}) @DirtiesContext public class EnableIntegrationTests { @@ -479,10 +478,10 @@ public class EnableIntegrationTests { @DirtiesContext public void testChangePatterns() { assertThatIllegalStateException() - .isThrownBy(() -> this.configurer.setComponentNamePatterns(new String[]{ "*" })) + .isThrownBy(() -> this.configurer.setComponentNamePatterns(new String[] {"*"})) .withMessageContaining("cannot be changed"); this.configurer.stop(); - this.configurer.setComponentNamePatterns(new String[]{ "*" }); + this.configurer.setComponentNamePatterns(new String[] {"*"}); assertThat(TestUtils.getPropertyValue(this.configurer, "componentNamePatterns", String[].class)[0]) .isEqualTo("*"); } @@ -1405,7 +1404,7 @@ public class EnableIntegrationTests { } @MyServiceActivator1(inputChannel = "annInput1", autoStartup = "true", - adviceChain = { "annAdvice1" }, poller = @Poller(fixedRate = "2000")) + adviceChain = {"annAdvice1"}, poller = @Poller(fixedRate = "2000")) public Integer annCount1() { return 0; } @@ -1492,7 +1491,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MessagingGateway(defaultRequestChannel = "gatewayChannel", defaultRequestTimeout = "${default.request.timeout:12300}", defaultReplyTimeout = "#{13400}", @@ -1517,13 +1516,13 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @ServiceActivator(autoStartup = "false", phase = "23", inputChannel = "annInput", outputChannel = "annOutput", - adviceChain = { "annAdvice" }, + adviceChain = {"annAdvice"}, poller = @Poller(fixedDelay = "1000")) public @interface MyServiceActivator { @@ -1534,7 +1533,7 @@ public class EnableIntegrationTests { String outputChannel() default ""; @AliasFor(annotation = ServiceActivator.class, attribute = "adviceChain") - String[] adviceChain() default { }; + String[] adviceChain() default {}; @AliasFor(annotation = ServiceActivator.class, attribute = "autoStartup") String autoStartup() default ""; @@ -1547,7 +1546,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator public @interface MyServiceActivator1 { @@ -1556,7 +1555,7 @@ public class EnableIntegrationTests { String outputChannel() default ""; - String[] adviceChain() default { }; + String[] adviceChain() default {}; String autoStartup() default ""; @@ -1566,7 +1565,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator1 public @interface MyServiceActivator2 { @@ -1575,7 +1574,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator2 public @interface MyServiceActivator3 { @@ -1584,7 +1583,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator3(inputChannel = "annInput3") public @interface MyServiceActivator4 { @@ -1593,7 +1592,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator4 public @interface MyServiceActivator5 { @@ -1604,7 +1603,7 @@ public class EnableIntegrationTests { // Test prevent infinite recursion - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator5 public @interface MyServiceActivator6 { @@ -1613,7 +1612,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator8 public @interface MyServiceActivator7 { @@ -1622,7 +1621,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @MyServiceActivator7 public @interface MyServiceActivator8 { @@ -1638,7 +1637,7 @@ public class EnableIntegrationTests { phase = "23", inputChannel = "annInput", outputChannel = "annOutput", - adviceChain = { "annAdvice" }, + adviceChain = {"annAdvice"}, poller = @Poller(fixedDelay = "1000")) public @interface MyServiceActivatorNoLocalAtts { @@ -1690,7 +1689,7 @@ public class EnableIntegrationTests { } - @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) @InboundChannelAdapter(value = "counterChannel", autoStartup = "false", phase = "23") public @interface MyInboundChannelAdapter { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java index d04d6a8ddb..50d3a67127 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/context/IntegrationContextTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.context; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +25,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java index 590d4cfbd5..8da6e0efee 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; @@ -40,6 +37,9 @@ import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.Assert; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @since 2.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java index 2ebf7ab044..392029e783 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Properties; import org.junit.jupiter.api.Test; @@ -32,6 +29,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java index 33ff7c4659..a15b3129d0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.verify; - import java.lang.reflect.Field; import java.util.UUID; @@ -39,6 +35,10 @@ import org.springframework.util.IdGenerator; import org.springframework.util.ReflectionUtils; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -51,10 +51,12 @@ public class MessageIdGenerationTests { @Test public void testCustomIdGenerationWithParentRegistrar() { - try (ClassPathXmlApplicationContext parent = - new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", getClass()); + try ( + ClassPathXmlApplicationContext parent = + new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", + getClass()); ClassPathXmlApplicationContext child = - new ClassPathXmlApplicationContext(new String[]{ "MessageIdGenerationTests-context.xml" }, + new ClassPathXmlApplicationContext(new String[] {"MessageIdGenerationTests-context.xml"}, getClass(), parent)) { IdGenerator idGenerator = child.getBean("idGenerator", IdGenerator.class); MessageChannel inputChannel = child.getBean("input", MessageChannel.class); @@ -66,8 +68,10 @@ public class MessageIdGenerationTests { @Test public void testCustomIdGenerationWithParentChildIndependentCreation() { - try (ClassPathXmlApplicationContext parent = - new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", getClass()); + try ( + ClassPathXmlApplicationContext parent = + new ClassPathXmlApplicationContext("MessageIdGenerationTests-context-withGenerator.xml", + getClass()); GenericXmlApplicationContext child = new GenericXmlApplicationContext()) { child.load("classpath:/org/springframework/integration/core/MessageIdGenerationTests-context.xml"); @@ -84,11 +88,12 @@ public class MessageIdGenerationTests { @Test public void testCustomIdGenerationWithChildRegistrar() { - try (ClassPathXmlApplicationContext parent = - new ClassPathXmlApplicationContext("MessageIdGenerationTests-context.xml", getClass()); + try ( + ClassPathXmlApplicationContext parent = + new ClassPathXmlApplicationContext("MessageIdGenerationTests-context.xml", getClass()); ClassPathXmlApplicationContext child = new ClassPathXmlApplicationContext( - new String[]{ "MessageIdGenerationTests-context-withGenerator.xml" }, + new String[] {"MessageIdGenerationTests-context-withGenerator.xml"}, getClass(), parent)) { IdGenerator idGenerator = child.getBean("idGenerator", IdGenerator.class); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java b/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java index 0e1fc1b8db..f4f41d9343 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ class TimeBasedUUIDGenerator { lastTime = currentTimeMillis; clockSequence = 0; } - else { + else { ++clockSequence; } } @@ -94,8 +94,9 @@ class TimeBasedUUIDGenerator { return new UUID(time, lsb); } } + private static long getMac() { - long macAddressAsLong = 0; + long macAddressAsLong = 0; try { InetAddress address = InetAddress.getLocalHost(); NetworkInterface ni = NetworkInterface.getByInetAddress(address); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java index 8bcdffa4f6..3a4b9c9be2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; @@ -28,6 +26,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java index 566ebf3870..38fd8bec78 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -41,6 +34,13 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java index dd5dc0e258..e7d5f11442 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -34,6 +31,9 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySetTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySetTests.java index 3ce50c9c77..ca38f45b5a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySetTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/OrderedAwareCopyOnWriteArraySetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -25,13 +23,15 @@ import org.junit.jupiter.api.Test; import org.springframework.core.Ordered; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan * * @since 1.0.3 */ -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class OrderedAwareCopyOnWriteArraySetTests { /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java index 09f72f343f..f444c0df14 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.concurrent.Callable; @@ -46,6 +44,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.transaction.support.DefaultTransactionStatus; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java index c201fc18a3..c71ba9bb7d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -39,6 +33,12 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java index 2ffcb0e14c..26aed31ff4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,17 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.startsWith; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; @@ -43,6 +32,17 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.startsWith; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java index de1af0feb0..91866e1738 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/TransactionalPollerWithMixedAopConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.aop.framework.Advised; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -37,7 +37,7 @@ public class TransactionalPollerWithMixedAopConfigTests { @Test public void validateTransactionalProxyIsolationToThePollerOnly() { ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("TransactionalPollerWithMixedAopConfig-context.xml", this.getClass()); + new ClassPathXmlApplicationContext("TransactionalPollerWithMixedAopConfig-context.xml", this.getClass()); assertThat(!(context.getBean("foo") instanceof Advised)).isTrue(); assertThat(!(context.getBean("inputChannel") instanceof Advised)).isTrue(); @@ -45,11 +45,13 @@ public class TransactionalPollerWithMixedAopConfigTests { } public static class SampleService { - public void foo(String payload) { } + public void foo(String payload) { + } } public static class Foo { - public Foo(String value) { } + public Foo(String value) { + } } // public static class SampleAdvice implements MethodInterceptor{ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java index 1a204aa730..11fccac7e5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dispatcher; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -29,6 +27,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/LambdaMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/LambdaMessageProcessorTests.java index 6c5e7f287b..84700eb808 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/LambdaMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/LambdaMessageProcessorTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Date; import java.util.Objects; import java.util.function.Function; @@ -40,6 +37,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/PollersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/PollersTests.java index 997c6a6b27..e2fc767ddd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/PollersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/PollersTests.java @@ -16,14 +16,14 @@ package org.springframework.integration.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import org.junit.jupiter.api.Test; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/composition/IntegrationFlowCompositionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/composition/IntegrationFlowCompositionTests.java index 37a9a3af26..7496181d00 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/composition/IntegrationFlowCompositionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/composition/IntegrationFlowCompositionTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.dsl.composition; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; @@ -40,6 +36,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + /** * @author Artem Bilan * @@ -120,7 +120,8 @@ public class IntegrationFlowCompositionTests { @Test void testInvalidStartFlowForComposition() { - IntegrationFlow startFlow = f -> f.handle(m -> { }); + IntegrationFlow startFlow = f -> f.handle(m -> { + }); assertThatIllegalArgumentException() .isThrownBy(() -> IntegrationFlow.from(startFlow)) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java index b786d79ed9..874144c4d0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.correlation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -25,8 +23,12 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.TextNode; import org.junit.Test; import org.junit.runner.RunWith; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -53,10 +55,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.TextNode; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -167,7 +166,7 @@ public class CorrelationHandlerTests { .isNotNull() .extracting(Message::getPayload) .isInstanceOf(ArrayNode.class) - .extracting(new String[] { "_children" }) + .extracting(new String[] {"_children"}) .element(0) .asList() .hasSize(0); @@ -191,13 +190,13 @@ public class CorrelationHandlerTests { @SuppressWarnings("unchecked") Flux> window = registration.getMessagingTemplate() - .convertSendAndReceive(new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, Flux.class); + .convertSendAndReceive(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, Flux.class); assertThat(window).isNotNull(); StepVerifier.create( - window.map(Message::getPayload) - .cast(Integer.class)) + window.map(Message::getPayload) + .cast(Integer.class)) .expectNextSequence(IntStream.range(0, 10).boxed().collect(Collectors.toList())) .verifyComplete(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/extensions/IntegrationFlowExtensionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/extensions/IntegrationFlowExtensionTests.java index 12e912c65d..35513864bf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/extensions/IntegrationFlowExtensionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/extensions/IntegrationFlowExtensionTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.extensions; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -39,6 +37,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/flows/IntegrationFlowTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/flows/IntegrationFlowTests.java index 3dcfcf8364..47521b3c5d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/flows/IntegrationFlowTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/flows/IntegrationFlowTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.dsl.flows; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -36,6 +33,7 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.ListableBeanFactory; @@ -99,7 +97,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/flowservices/FlowServiceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/flowservices/FlowServiceTests.java index 4e1e94b4d9..e9495c2f2f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/flowservices/FlowServiceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/flowservices/FlowServiceTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.dsl.flowservices; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.withinPercentage; - import java.time.Instant; import java.util.Collection; import java.util.Collections; @@ -63,6 +60,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.withinPercentage; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/gateway/GatewayDslTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/gateway/GatewayDslTests.java index efb4b057d0..63ce7c46fe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/gateway/GatewayDslTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/gateway/GatewayDslTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.dsl.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.lang.reflect.Method; import java.util.List; import java.util.Map; @@ -52,6 +49,9 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @@ -207,11 +207,11 @@ public class GatewayDslTests { @Bean public IntegrationFlow functionGateway() { return IntegrationFlow.from(MessageFunction.class, - (gateway) -> gateway - .header("gatewayMethod", MethodArgsHolder::getMethod) - .header("gatewayArgs", MethodArgsHolder::getArgs) - .replyTimeout(10) - .requestTimeout(20)) + (gateway) -> gateway + .header("gatewayMethod", MethodArgsHolder::getMethod) + .header("gatewayArgs", MethodArgsHolder::getArgs) + .replyTimeout(10) + .requestTimeout(20)) .bridge() .get(); } @@ -219,7 +219,7 @@ public class GatewayDslTests { @Bean public IntegrationFlow routingGatewayFlow() { return IntegrationFlow.from(RoutingGateway.class, - (gateway) -> gateway.beanName("routingGateway").header("gatewayMethod", MethodArgsHolder::getMethod)) + (gateway) -> gateway.beanName("routingGateway").header("gatewayMethod", MethodArgsHolder::getMethod)) .route(Message.class, (message) -> message.getHeaders().get("gatewayMethod", Method.class).getName(), (router) -> router diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/lifecycle/IntegrationComponentSpecLifecycleTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/lifecycle/IntegrationComponentSpecLifecycleTests.java index fcd24dfdb0..bbeb9e79c6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/lifecycle/IntegrationComponentSpecLifecycleTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/lifecycle/IntegrationComponentSpecLifecycleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.lifecycle; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +45,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StringValueResolver; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java index 84451d9c4f..694d62de37 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/manualflow/ManualFlowTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.dsl.manualflow; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.lang.reflect.Method; import java.time.Instant; import java.util.Arrays; @@ -37,6 +32,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationNotAllowedException; @@ -90,7 +86,10 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; -import reactor.core.publisher.Flux; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** * @author Artem Bilan @@ -257,10 +256,10 @@ public class ManualFlowTests { PollableChannel resultChannel = new QueueChannel(); this.integrationFlowContext.registration(flow -> - flow.publishSubscribeChannel(p -> p - .minSubscribers(1) - .subscribe(f -> f.channel(resultChannel)) - )) + flow.publishSubscribeChannel(p -> p + .minSubscribers(1) + .subscribe(f -> f.channel(resultChannel)) + )) .id("dynamicFlow") .register(); @@ -329,9 +328,9 @@ public class ManualFlowTests { IntegrationFlowRegistration flowRegistration = this.integrationFlowContext.registration( - flow -> flow - .handle(new MessageProducingHandler()) - .channel(resultChannel)) + flow -> flow + .handle(new MessageProducingHandler()) + .channel(resultChannel)) .register(); this.integrationFlowContext.messagingTemplateFor(flowRegistration.getId()) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/publishsubscribe/PublishSubscribeTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/publishsubscribe/PublishSubscribeTests.java index 1224912fc5..579a558e54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/publishsubscribe/PublishSubscribeTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/publishsubscribe/PublishSubscribeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.publishsubscribe; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; @@ -38,6 +36,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java index 7fdcf60eb1..4af374c711 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/reactivestreams/ReactiveStreamsTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.reactivestreams; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.time.Instant; import java.util.ArrayList; @@ -33,6 +31,9 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; +import reactor.core.scheduler.Schedulers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -53,9 +54,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; -import reactor.core.scheduler.Schedulers; +import static org.assertj.core.api.Assertions.assertThat; /** @@ -116,7 +115,7 @@ public class ReactiveStreamsTests { }); assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue(); String[] strings = results.toArray(new String[0]); - assertThat(strings).isEqualTo(new String[]{ "A", "B", "C", "D", "E", "F" }); + assertThat(strings).isEqualTo(new String[] {"A", "B", "C", "D", "E", "F"}); disposable.dispose(); assertThat(this.messageSource.isRunning()).isFalse(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/NoFallbackAllowedTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/NoFallbackAllowedTests.java index 0d216213b2..b154c4b8cf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/NoFallbackAllowedTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/NoFallbackAllowedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.dsl.routers; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java index 1c8f3b4caf..470d2d1447 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.dsl.routers; -import static org.assertj.core.api.Assertions.as; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Arrays; import java.util.List; import java.util.Map; @@ -62,6 +58,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.as; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @author Gary Russell @@ -93,7 +93,7 @@ public class RouterTests { public void testRouter() { this.beanFactory.containsBean("routeFlow.subFlow#0.channel#0"); - int[] payloads = { 1, 2, 3, 4, 5, 6 }; + int[] payloads = {1, 2, 3, 4, 5, 6}; for (int payload : payloads) { this.routerInput.send(new GenericMessage<>(payload)); @@ -628,7 +628,7 @@ public class RouterTests { @Configuration @EnableIntegration - @EnableMessageHistory({ "recipientListOrder*", "recipient1*", "recipient2*" }) + @EnableMessageHistory({"recipientListOrder*", "recipient1*", "recipient2*"}) public static class ContextConfiguration { @Bean @@ -749,7 +749,7 @@ public class RouterTests { public IntegrationFlow routeMultiMethodInvocationFlow() { return IntegrationFlow.from("routerMultiInput") .route(String.class, p -> p.equals("foo") || p.equals("bar") - ? new String[]{ "foo", "bar" } + ? new String[] {"foo", "bar"} : null, s -> s.suffix("-channel")) .get(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java index 89ad74564e..ddaa0bf4aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.dsl.transformers; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.InputStream; import java.io.OutputStream; import java.util.Collections; @@ -54,6 +51,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @author Ian Bondoc diff --git a/spring-integration-core/src/test/java/org/springframework/integration/enablecomponentscan/EnableComponentScanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/enablecomponentscan/EnableComponentScanTests.java index 3f4f7202db..5db771d81a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/enablecomponentscan/EnableComponentScanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/enablecomponentscan/EnableComponentScanTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.enablecomponentscan; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Collections; @@ -38,6 +36,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ClassUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/BeanNameTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/BeanNameTests.java index 8fedebcb8b..e6cd74e249 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/BeanNameTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/BeanNameTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -38,8 +38,7 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell @@ -142,7 +141,8 @@ public class BeanNameTests { @EndpointId("eipBean2") @ServiceActivator(inputChannel = "channel3") public MessageHandler handler() { - return m -> { }; + return m -> { + }; } @EndpointId("eipMethodSource") diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java index deae56d7ea..754f7a0fde 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -31,6 +28,9 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java index 5025f704d7..35f5d4c5fc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.ArrayList; import java.util.HashMap; @@ -38,6 +35,9 @@ import org.springframework.messaging.Message; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java index 5b41c2d876..ef4cb722e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -27,6 +24,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java index 11f8379fd6..7670af9351 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -34,6 +32,8 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java index d148d555bd..7a5d0a5fcf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageSourcePollingTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - import java.util.Collections; import org.junit.Test; @@ -34,6 +27,13 @@ import org.springframework.integration.core.MessageSource; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @@ -49,7 +49,8 @@ public class MessageSourcePollingTemplateTests { MessageSource source = () -> new GenericMessage<>("foo", Collections.singletonMap(IntegrationMessageHeaderAccessor.ACKNOWLEDGMENT_CALLBACK, callback)); MessageSourcePollingTemplate template = new MessageSourcePollingTemplate(source); - template.poll(h -> { }); + template.poll(h -> { + }); verify(callback).acknowledge(Status.ACCEPT); try { template.poll(h -> { @@ -70,7 +71,8 @@ public class MessageSourcePollingTemplateTests { MessageSource source = () -> new GenericMessage<>("foo", Collections.singletonMap(IntegrationMessageHeaderAccessor.ACKNOWLEDGMENT_CALLBACK, callback)); MessageSourcePollingTemplate template = new MessageSourcePollingTemplate(source); - template.poll(h -> { }); + template.poll(h -> { + }); verify(callback, never()).acknowledge(Status.ACCEPT); verify(callback, never()).acknowledge(Status.REJECT); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollerAdviceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollerAdviceTests.java index 384070d295..7825f366d7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollerAdviceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollerAdviceTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.time.Duration; import java.util.ArrayList; import java.util.Collections; @@ -73,6 +67,12 @@ import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan @@ -313,7 +313,8 @@ public class PollerAdviceTests { return false; } - }, m -> { }); + }, m -> { + }); SimpleActiveIdleReceiveMessageAdvice toggling = new SimpleActiveIdleReceiveMessageAdvice(trigger); toggling.setActivePollPeriod(11); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java index a1e514f622..4e311e25e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.atomic.AtomicInteger; import org.junit.After; @@ -37,13 +34,16 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Iwein Fuld * @author Mark Fisher * @author Kiel Boatman * @author Artem Bilan */ -@SuppressWarnings({ "rawtypes", "unchecked" }) +@SuppressWarnings({"rawtypes", "unchecked"}) public class PollingConsumerEndpointTests { private final OnlyOnceTrigger trigger = new OnlyOnceTrigger(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java index 796cc3e219..4b01834ade 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -25,6 +23,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java index a27488d07d..3cc371c4aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.atMost; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; - import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -48,6 +42,12 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atMost; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests.java index 9128df244d..bc6184859a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -33,6 +31,8 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java index 0f5c0beadf..1f134d4f97 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.concurrent.atomic.AtomicInteger; @@ -49,6 +45,10 @@ import org.springframework.transaction.support.TransactionSynchronizationManager import org.springframework.transaction.support.TransactionSynchronizationUtils; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java index 3f1d14ebaa..e7cedee628 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2021 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.ArrayList; import java.util.Date; @@ -26,6 +24,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -43,8 +43,7 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -87,7 +86,7 @@ public class ReactiveInboundChannelAdapterTests { Flux.from(this.fluxChannel2) .map(Message::getPayload) .cast(Date.class) - .map(Date::getTime); + .map(Date::getTime); List dates = new ArrayList<>(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageProducerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageProducerTests.java index edb2b12deb..77124b02e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageProducerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageProducerTests.java @@ -16,13 +16,13 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -35,8 +35,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java index 3c956fdf5b..f482b99fc7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveMessageSourceProducerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,6 +24,8 @@ import java.util.stream.IntStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.IntegrationMessageHeaderAccessor; @@ -36,8 +35,8 @@ import org.springframework.integration.core.MessageSource; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; /** * @author Artem Bilan @@ -86,9 +85,9 @@ public class ReactiveMessageSourceProducerTests { StepVerifier stepVerifier = StepVerifier.create( - Flux.from(outputChannel) - .map(Message::getPayload) - .cast(Integer.class)) + Flux.from(outputChannel) + .map(Message::getPayload) + .cast(Integer.class)) .expectNextSequence( IntStream.range(0, 10) .boxed() diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index 99bee491d8..0c72e718a1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.core.DestinationResolutionException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index 107635f9a8..182900ae15 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -33,6 +30,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java index b6db5aa75b..e9365b5397 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.endpoint; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Date; import org.junit.Test; @@ -33,6 +30,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/DynamicExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/DynamicExpressionTests.java index 2b2e2f305e..e583c78ea2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/DynamicExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/DynamicExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.expression; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.FileOutputStream; import org.junit.After; @@ -25,6 +23,8 @@ import org.junit.Test; import org.springframework.core.io.ClassPathResource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @since 2.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java index 2cf1d4efce..2b2d859a8c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/ExpressionUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.expression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.function.Supplier; import org.junit.jupiter.api.Test; @@ -33,6 +31,8 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/ForeignClassloaderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/ForeignClassloaderTests.java index bdaf0410e3..1c17d9e85a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/ForeignClassloaderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/ForeignClassloaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.expression; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 3.0.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java index d1e9525a6c..66d9950e46 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java @@ -16,15 +16,13 @@ package org.springframework.integration.expression; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.Test; import org.springframework.beans.BeansException; @@ -51,7 +49,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.ClassUtils; -import com.fasterxml.jackson.databind.JsonNode; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java index dac797ccea..b9ec6fedb1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java index dd55266814..adea52363f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.annotation.Filter; @@ -28,6 +26,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artme Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java index f6ecbd2295..d4f6a9ef44 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index c3725da0eb..c7cc1c6775 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.MessageRejectedException; @@ -27,6 +25,8 @@ import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java index 30197c4b46..dc86c7fb56 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import org.junit.Test; @@ -27,6 +24,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java index 62b40616e2..4c3ad46f4c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.filter; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java index e0db108aba..b19a7c8ad0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; @@ -29,6 +25,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; @@ -46,8 +44,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.ReflectionUtils; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java index 769fb47d87..c3ffd344a8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -98,6 +92,12 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ClassUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -440,7 +440,8 @@ public class GatewayInterfaceTests { org.springframework.util.concurrent.ListenableFuture result3 = this.execGateway.test3(Thread.currentThread()); final CountDownLatch latch1 = new CountDownLatch(1); - result3.addCallback(data -> latch1.countDown(), ex -> { }); + result3.addCallback(data -> latch1.countDown(), ex -> { + }); assertThat(latch1.await(10, TimeUnit.SECONDS)).isTrue(); assertThat(result3.get().getName()).startsWith("exec-"); @@ -713,7 +714,8 @@ public class GatewayInterfaceTests { @Conditional(GatewayByAnnotationGPFBCondition.class) @Bean PrimaryGateway notPrimaryGatewayInstance(GatewayByAnnotationGPFB annotationGPFB) { - return payload -> { }; + return payload -> { + }; } } @@ -826,7 +828,7 @@ public class GatewayInterfaceTests { } - @Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE }) + @Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) public @interface TestMessagingGateway { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java index 57b12f95f8..c5f3c7ea37 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +31,9 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java index e7bea7d7c9..96d71ad92f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; @@ -39,6 +34,11 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell @@ -51,7 +51,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { Method method = TestService.class.getMethod("sendPayload", String.class); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test" }); + Message message = mapper.toMessage(new Object[] {"test"}); assertThat(message.getPayload()).isEqualTo("test"); } @@ -61,7 +61,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); assertThatIllegalArgumentException() - .isThrownBy(() -> mapper.toMessage(new Object[] { "test", "oops" })); + .isThrownBy(() -> mapper.toMessage(new Object[] {"test", "oops"})); } @Test @@ -79,7 +79,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { "sendPayloadAndHeader", String.class, String.class); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test", "bar" }); + Message message = mapper.toMessage(new Object[] {"test", "bar"}); assertThat(message.getPayload()).isEqualTo("test"); assertThat(message.getHeaders().get("foo")).isEqualTo("bar"); } @@ -91,7 +91,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); assertThatExceptionOfType(MessageMappingException.class) - .isThrownBy(() -> mapper.toMessage(new Object[] { "test", null })); + .isThrownBy(() -> mapper.toMessage(new Object[] {"test", null})); } @Test @@ -100,7 +100,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { "sendPayloadAndOptionalHeader", String.class, String.class); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test", "bar" }); + Message message = mapper.toMessage(new Object[] {"test", "bar"}); assertThat(message.getPayload()).isEqualTo("test"); assertThat(message.getHeaders().get("foo")).isEqualTo("bar"); } @@ -111,7 +111,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { "sendPayloadAndOptionalHeader", String.class, String.class); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test", null }); + Message message = mapper.toMessage(new Object[] {"test", null}); assertThat(message.getPayload()).isEqualTo("test"); assertThat(message.getHeaders().get("foo")).isNull(); } @@ -125,7 +125,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { Map headers = new HashMap<>(); headers.put("abc", 123); headers.put("def", 456); - Message message = mapper.toMessage(new Object[] { "test", headers }); + Message message = mapper.toMessage(new Object[] {"test", headers}); assertThat(message.getPayload()).isEqualTo("test"); assertThat(message.getHeaders().get("abc")).isEqualTo(123); assertThat(message.getHeaders().get("def")).isEqualTo(456); @@ -137,7 +137,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { "sendPayloadAndHeadersMap", String.class, Map.class); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test", null }); + Message message = mapper.toMessage(new Object[] {"test", null}); assertThat(message.getPayload()).isEqualTo("test"); } @@ -150,7 +150,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { Map headers = new HashMap<>(); headers.put(123, "abc"); assertThatExceptionOfType(MessageMappingException.class) - .isThrownBy(() -> mapper.toMessage(new Object[] { "test", headers })); + .isThrownBy(() -> mapper.toMessage(new Object[] {"test", headers})); } @Test @@ -159,7 +159,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); Message inputMessage = MessageBuilder.withPayload("test message").build(); - Message message = mapper.toMessage(new Object[] { inputMessage }); + Message message = mapper.toMessage(new Object[] {inputMessage}); assertThat(message.getPayload()).isEqualTo("test message"); } @@ -169,7 +169,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); Message inputMessage = MessageBuilder.withPayload("test message").build(); - Message message = mapper.toMessage(new Object[] { inputMessage, "bar" }); + Message message = mapper.toMessage(new Object[] {inputMessage, "bar"}); assertThat(message.getPayload()).isEqualTo("test message"); assertThat(message.getHeaders().get("foo")).isEqualTo("bar"); } @@ -181,7 +181,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { mapper.setBeanFactory(mock(BeanFactory.class)); Message inputMessage = MessageBuilder.withPayload("test message").build(); assertThatExceptionOfType(MessageMappingException.class) - .isThrownBy(() -> mapper.toMessage(new Object[] { inputMessage, null })); + .isThrownBy(() -> mapper.toMessage(new Object[] {inputMessage, null})); } @Test @@ -190,7 +190,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); Message inputMessage = MessageBuilder.withPayload("test message").build(); - Message message = mapper.toMessage(new Object[] { inputMessage, "bar" }); + Message message = mapper.toMessage(new Object[] {inputMessage, "bar"}); assertThat(message.getPayload()).isEqualTo("test message"); assertThat(message.getHeaders().get("foo")).isEqualTo("bar"); } @@ -201,7 +201,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); Message inputMessage = MessageBuilder.withPayload("test message").build(); - Message message = mapper.toMessage(new Object[] { inputMessage, null }); + Message message = mapper.toMessage(new Object[] {inputMessage, null}); assertThat(message.getPayload()).isEqualTo("test message"); assertThat(message.getHeaders().get("foo")).isNull(); } @@ -221,7 +221,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); assertThatExceptionOfType(MessageMappingException.class) - .isThrownBy(() -> mapper.toMessage(new Object[] { "abc", "def" })); + .isThrownBy(() -> mapper.toMessage(new Object[] {"abc", "def"})); } @Test @@ -233,7 +233,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { headers.put("baz", new LiteralExpression("hello")); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method, headers); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { "test" }); + Message message = mapper.toMessage(new Object[] {"test"}); assertThat(message.getPayload()).isEqualTo("test"); assertThat(message.getHeaders().get("foo")).isEqualTo("foo"); assertThat(message.getHeaders().get("bar")).isEqualTo(42); @@ -248,7 +248,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); mapper.setPayloadExpression(new LiteralExpression("hello")); - Message message = mapper.toMessage(new Object[] { map }); + Message message = mapper.toMessage(new Object[] {map}); assertThat(message.getPayload()).isEqualTo("hello"); } @@ -261,7 +261,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); mapper.setPayloadExpression(new FunctionExpression((methodArgs) -> methodArgs.getArgs()[0])); - Message message = mapper.toMessage(new Object[] { map }); + Message message = mapper.toMessage(new Object[] {map}); assertThat(message.getPayload()).isEqualTo(map); } @@ -273,7 +273,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { map.put(2, "Two"); GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); - Message message = mapper.toMessage(new Object[] { map }); + Message message = mapper.toMessage(new Object[] {map}); assertThat(message.getPayload()).isEqualTo(map); } @@ -289,7 +289,7 @@ public class GatewayMethodInboundMessageMapperToMessageTests { GatewayMethodInboundMessageMapper mapper = new GatewayMethodInboundMessageMapper(method); mapper.setBeanFactory(mock(BeanFactory.class)); mapper.setPayloadExpression(new FunctionExpression((methodArgs) -> methodArgs.getArgs()[0])); - Message message = mapper.toMessage(new Object[] { mapA, mapB }); + Message message = mapper.toMessage(new Object[] {mapA, mapB}); assertThat(message.getPayload()).isEqualTo(mapA); assertThat(message.getHeaders().get("1")).isEqualTo(mapB.get("1")); assertThat(message.getHeaders().get("2")).isEqualTo(mapB.get("2")); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index 9bf0bd44a3..a56ef2c4ef 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -16,13 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -69,6 +62,13 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java index f581447b5b..3abee8d5f8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.HashMap; import java.util.Map; @@ -36,6 +33,9 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayRequiresReplyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayRequiresReplyTests.java index 0ebc6c5034..ff1f76814d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayRequiresReplyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayRequiresReplyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert @@ -44,7 +44,7 @@ public class GatewayRequiresReplyTests { @Test public void replyReceived() { - TestService gateway = this.applicationContext.getBean("gateway", TestService.class); + TestService gateway = this.applicationContext.getBean("gateway", TestService.class); String result = gateway.test("foo"); assertThat(result).isEqualTo("bar"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java index f98e92540f..08a436018f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java index 1ae2275a42..accb6507c2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayXmlAndAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayXmlAndAnnotationTests.java index 349671cadb..1dde290967 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayXmlAndAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayXmlAndAnnotationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.Map; import java.util.Map.Entry; @@ -30,6 +28,8 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java index 08407d8fdd..78dceb6cba 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java index daca747fb2..cb167a9534 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -30,6 +28,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky @@ -63,7 +63,6 @@ public class InnerGatewayWithChainTests { private SubscribableChannel assignedErrorChannel; - @Test public void testExceptionHandledByMainGateway() { String reply = testGatewayWithErrorChannelA.echo(5); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java index 43de45fbf8..bdd59c1ad0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -44,6 +41,9 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessagingException; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java index 5fcb715432..dc8abbc807 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultiMethodGatewayConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -26,6 +24,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java index e959885a8b..b569c61538 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -27,6 +24,9 @@ import org.springframework.integration.handler.AbstractReplyProducingMessageHand import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell @@ -43,7 +43,8 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - final MessagingGatewaySupport innerGateway = new MessagingGatewaySupport() { }; + final MessagingGatewaySupport innerGateway = new MessagingGatewaySupport() { + }; innerGateway.setRequestChannel(innerChannel); innerGateway.setBeanFactory(mock(BeanFactory.class)); innerGateway.afterPropertiesSet(); @@ -54,7 +55,8 @@ public class NestedGatewayTests { "pre-" + requestMessage.getPayload()).getPayload() + "-post"; } }); - MessagingGatewaySupport outerGateway = new MessagingGatewaySupport() { }; + MessagingGatewaySupport outerGateway = new MessagingGatewaySupport() { + }; outerGateway.setRequestChannel(outerChannel); outerGateway.setBeanFactory(mock(BeanFactory.class)); outerGateway.afterPropertiesSet(); @@ -72,7 +74,8 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - MessagingGatewaySupport gateway = new MessagingGatewaySupport() { }; + MessagingGatewaySupport gateway = new MessagingGatewaySupport() { + }; gateway.setRequestChannel(requestChannel); gateway.setBeanFactory(mock(BeanFactory.class)); gateway.afterPropertiesSet(); @@ -93,7 +96,8 @@ public class NestedGatewayTests { return requestMessage.getPayload() + "-reply"; } }); - MessagingGatewaySupport gateway = new MessagingGatewaySupport() { }; + MessagingGatewaySupport gateway = new MessagingGatewaySupport() { + }; gateway.setRequestChannel(requestChannel); gateway.setBeanFactory(mock(BeanFactory.class)); gateway.afterPropertiesSet(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java index 4052e275f0..cdc46c83f2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java @@ -19,12 +19,12 @@ package org.springframework.integration.gateway; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; +import reactor.core.publisher.Mono; + import org.springframework.integration.annotation.Gateway; import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Payload; -import reactor.core.publisher.Mono; - /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/graph/IntegrationGraphServerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/graph/IntegrationGraphServerTests.java index f0dfc69057..e850da19c6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/graph/IntegrationGraphServerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/graph/IntegrationGraphServerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.graph; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.io.ByteArrayOutputStream; import java.time.Duration; import java.util.Arrays; @@ -26,6 +23,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import net.minidev.json.JSONArray; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -71,11 +73,8 @@ import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; -import net.minidev.json.JSONArray; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java index d28eefbfbd..84fa34ac5f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willReturn; - import java.util.Collections; import org.junit.Test; @@ -35,6 +30,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willReturn; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java index b9a099cdca..c2393ec4c2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/AsyncHandlerTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -48,6 +42,12 @@ import org.springframework.messaging.core.DestinationResolutionException; import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java index 5b833b529e..91ba918f1c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.integration.channel.QueueChannel; @@ -30,6 +27,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.core.DestinationResolutionException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CGLibProxyHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/CGLibProxyHandlerTests.java index 3de63bff8e..8685b4d7b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/CGLibProxyHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/CGLibProxyHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.3.10 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java index 442f62ee95..fc0d7393ac 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -31,6 +29,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert @@ -86,7 +86,7 @@ public class CollectionAndArrayTests { @Override protected Object handleRequestMessage(Message requestMessage) { - return new String[] { "foo", "bar" }; + return new String[] {"foo", "bar"}; } }; QueueChannel channel = new QueueChannel(); @@ -148,7 +148,7 @@ public class CollectionAndArrayTests { @Override protected Object splitMessage(Message message) { - return new String[] { "foo", "bar" }; + return new String[] {"foo", "bar"}; } }; QueueChannel channel = new QueueChannel(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java index cfd25cc5fb..b3544cdda1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java index bf2755737d..b6fcdef752 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.Calendar; import java.util.Date; @@ -62,6 +57,11 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java index aed9b5340b..080dd96607 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.UUID; @@ -45,6 +41,10 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java index ec3a89b28d..882cdd5d12 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; @@ -30,6 +27,9 @@ import org.springframework.integration.transformer.MethodInvokingTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Header; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java index 04ca886553..1453a99d56 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.function.Supplier; import org.apache.commons.logging.Log; @@ -47,6 +37,16 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java index 1feede0ceb..7c65ed4c6f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.List; @@ -37,6 +35,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java index a9777b5b29..33e8d537ab 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -35,6 +31,10 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan @@ -43,7 +43,7 @@ import org.springframework.messaging.handler.annotation.Payload; */ public class MethodInvokingHeaderEnricherTests { - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void emptyHeadersOnRequest() { TestBean testBean = new TestBean(); @@ -58,7 +58,7 @@ public class MethodInvokingHeaderEnricherTests { assertThat(result.getHeaders().get("bar")).isEqualTo("ABC"); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void overwriteFalseByDefault() { TestBean testBean = new TestBean(); @@ -72,7 +72,7 @@ public class MethodInvokingHeaderEnricherTests { assertThat(result.getHeaders().get("bar")).isEqualTo("XYZ"); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void overwriteFalseExplicit() { TestBean testBean = new TestBean(); @@ -87,7 +87,7 @@ public class MethodInvokingHeaderEnricherTests { assertThat(result.getHeaders().get("bar")).isEqualTo("XYZ"); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test public void overwriteTrue() { TestBean testBean = new TestBean(); @@ -106,7 +106,7 @@ public class MethodInvokingHeaderEnricherTests { public void overwriteId() { HeaderEnricher enricher = new HeaderEnricher(Collections.singletonMap(MessageHeaders.ID, - new StaticHeaderValueMessageProcessor<>("foo"))); + new StaticHeaderValueMessageProcessor<>("foo"))); try { enricher.afterPropertiesSet(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index 3c088dd773..4c8cd123a5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; @@ -47,6 +43,10 @@ import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Iwein Fuld @@ -54,7 +54,7 @@ import org.springframework.messaging.support.GenericMessage; * @author Gary Russell * @author Artem Bilan */ -@SuppressWarnings({ "rawtypes", "unchecked" }) +@SuppressWarnings({"rawtypes", "unchecked"}) public class MethodInvokingMessageProcessorAnnotationTests { private final TestService testService = new TestService(); @@ -465,7 +465,7 @@ public class MethodInvokingMessageProcessorAnnotationTests { @Payload Employee payloadArg, @Payload("fname") String value, @Headers Map headers) { - return new Object[]{ argA, argB, payloadArg, value, headers }; + return new Object[] {argA, argB, payloadArg, value, headers}; } public String irrelevantAnnotation(@BogusAnnotation String value) { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index 9ff4dd79e0..3d48c89f8f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -16,16 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.AdditionalAnswers.returnsFirstArg; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collections; @@ -41,6 +31,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.aopalliance.intercept.MethodInterceptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,8 +81,15 @@ import org.springframework.messaging.handler.invocation.HandlerMethodArgumentRes import org.springframework.messaging.support.GenericMessage; import org.springframework.util.StopWatch; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.AdditionalAnswers.returnsFirstArg; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; /** @@ -102,15 +101,14 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Gunnar Hillert * @author Artem Bilan */ -@SuppressWarnings({ "rawtypes", "unchecked" }) +@SuppressWarnings({"rawtypes", "unchecked"}) public class MethodInvokingMessageProcessorTests { private static final Log logger = LogFactory.getLog(MethodInvokingMessageProcessorTests.class); @Test public void testMessageHandlerMethodFactoryOverride() { - try (AnnotationConfigApplicationContext context = - new AnnotationConfigApplicationContext(MyConfiguration.class)) { + try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(MyConfiguration.class)) { MessageChannel channel = context.getBean("foo", MessageChannel.class); channel.send(MessageBuilder.withPayload("Bob Smith").build()); PollableChannel out = context.getBean("out", PollableChannel.class); @@ -1170,8 +1168,8 @@ public class MethodInvokingMessageProcessorTests { @Test void lifecycleOnly() { assertThatIllegalStateException().isThrownBy(() -> - new MethodInvokingMessageProcessor(new LifecycleBean(), (String) null)) - .withMessageContaining("no eligible methods"); + new MethodInvokingMessageProcessor(new LifecycleBean(), (String) null)) + .withMessageContaining("no eligible methods"); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java index 8e062cec6d..ff92c76f88 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -31,6 +29,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ReactiveMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ReactiveMessageHandlerTests.java index 5d2bd7d2ff..ccac1d28b0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ReactiveMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ReactiveMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,18 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicBoolean; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; /** * @author David Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java index 0d41ef3de6..0301b7b91d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/SendTimeoutConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java index e6988fcb76..0e458da846 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; @@ -45,6 +42,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * See INT-1688 for background. * @@ -347,5 +347,4 @@ public class ServiceActivatorDefaultFrameworkMethodTests { } - } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorOnMockitoMockTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorOnMockitoMockTests.java index 8cdfa29cb4..33d679368d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorOnMockitoMockTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorOnMockitoMockTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler; -import static org.mockito.Mockito.verify; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.mockito.Mockito.verify; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java index f586d5bfd7..8c2550c1ec 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; @@ -71,6 +63,14 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -833,7 +833,7 @@ public class AdvisedMessageHandlerTests { Method method = AbstractReplyProducingMessageHandler.class.getDeclaredMethod("handleRequestMessage", Message.class); when(methodInvocation.getMethod()).thenReturn(method); - when(methodInvocation.getArguments()).thenReturn(new Object[]{ new GenericMessage<>("foo") }); + when(methodInvocation.getArguments()).thenReturn(new Object[] {new GenericMessage<>("foo")}); try { doAnswer(invocation -> { throw theThrowable; @@ -889,10 +889,12 @@ public class AdvisedMessageHandlerTests { } }; PollableChannel inputChannel = new QueueChannel(); - PollingConsumer consumer = new PollingConsumer(inputChannel, message -> { }); + PollingConsumer consumer = new PollingConsumer(inputChannel, message -> { + }); consumer.setAdviceChain(Collections.singletonList(advice)); ExecutorService exec = Executors.newSingleThreadExecutor(); - consumer.setTaskExecutor(new ErrorHandlingTaskExecutor(exec, t -> { })); + consumer.setTaskExecutor(new ErrorHandlingTaskExecutor(exec, t -> { + })); consumer.setBeanFactory(mock(BeanFactory.class)); consumer.afterPropertiesSet(); consumer.setTaskScheduler(mock(TaskScheduler.class)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdviceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdviceTests.java index eca81514cc..8efcacd551 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdviceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/CacheRequestHandlerAdviceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; @@ -41,6 +39,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdviceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdviceTests.java index 9ae8aedebc..a450b0bfdd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdviceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdviceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; - import org.aopalliance.aop.Advice; import org.junit.jupiter.api.Test; @@ -35,6 +33,8 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/IdempotentReceiverTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/IdempotentReceiverTests.java index b2e271cdb8..7f9bf77123 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/IdempotentReceiverTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/IdempotentReceiverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -47,6 +44,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @since 4.1 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdviceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdviceTests.java index 0a9ab243de..fad27d8c03 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdviceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/RateLimiterRequestHandlerAdviceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,12 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.stream.IntStream; +import io.github.resilience4j.ratelimiter.RateLimiterConfig; +import io.github.resilience4j.ratelimiter.RequestNotPermitted; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -38,8 +37,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import io.github.resilience4j.ratelimiter.RateLimiterConfig; -import io.github.resilience4j.ratelimiter.RequestNotPermitted; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java index 709fc6e1cb..ad33fda3fe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.handler.advice; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.retry.RetryState; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/support/MessagingMethodInvocableHelperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/support/MessagingMethodInvocableHelperTests.java index 51011acc73..e24cf4b25e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/support/MessagingMethodInvocableHelperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/support/MessagingMethodInvocableHelperTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.handler.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.Map; @@ -36,6 +34,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedTests.java index ff818b45eb..36e2c9c31f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.history; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.lang.reflect.Field; import java.util.Properties; @@ -37,6 +32,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index 9f13d9d92c..484b74e15f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.history; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -40,6 +37,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java index e9ce9089b4..434a38a7be 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.lang.reflect.Type; import java.util.Arrays; import java.util.HashMap; @@ -37,6 +34,9 @@ import org.springframework.integration.support.json.JsonObjectMapperProvider; import org.springframework.integration.test.predicate.MessagePredicate; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Jeremy Grelle * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java index fa67408264..0923af85a1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.history.MessageHistory; @@ -29,6 +27,8 @@ import org.springframework.integration.support.json.JsonOutboundMessageMapper; import org.springframework.integration.test.predicate.MessagePredicate; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jeremy Grelle diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/ContentTypeConversionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/ContentTypeConversionTests.java index 9c4e772a9c..56ed5d07ee 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/ContentTypeConversionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/ContentTypeConversionTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @@ -43,6 +41,8 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java index f1b0338ef2..91c11b1857 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,12 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.springframework.integration.history.MessageHistory; @@ -28,10 +30,7 @@ import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.support.json.JsonOutboundMessageMapper; import org.springframework.messaging.Message; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Jeremy Grelle diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java index 53cd94c7b6..75a844fd79 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,15 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.File; import java.io.IOException; import java.util.Map; import java.util.Scanner; +import com.jayway.jsonpath.Criteria; +import com.jayway.jsonpath.Filter; +import com.jayway.jsonpath.PathNotFoundException; +import com.jayway.jsonpath.Predicate; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,10 +49,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import com.jayway.jsonpath.Criteria; -import com.jayway.jsonpath.Filter; -import com.jayway.jsonpath.PathNotFoundException; -import com.jayway.jsonpath.Predicate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPropertyAccessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPropertyAccessorTests.java index 435c013f6f..0a425fbf1d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPropertyAccessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPropertyAccessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,12 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,10 +33,8 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.integration.json.JsonPropertyAccessor.ComparableJsonNode; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * Tests for {@link JsonPropertyAccessor}. diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java index e27080f6ea..93c8c218ef 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.util.function.Supplier; import org.junit.jupiter.api.Test; @@ -41,6 +36,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerTests.java index f2fae531f1..2050949d11 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.core.ParameterizedTypeReference; @@ -29,8 +29,7 @@ import org.springframework.integration.support.json.Jackson2JsonObjectMapper; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher @@ -45,7 +44,8 @@ public class JsonToObjectTransformerTests { public void objectPayload() { JsonToObjectTransformer transformer = new JsonToObjectTransformer( - ResolvableType.forType(new ParameterizedTypeReference>() { })); + ResolvableType.forType(new ParameterizedTypeReference>() { + })); // Since DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES is disabled by default // (see Jackson2JsonObjectMapper) // the extra "foo" property is ignored. diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonTransformersSymmetricalTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonTransformersSymmetricalTests.java index 50bf4976b7..8d154f4de5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonTransformersSymmetricalTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonTransformersSymmetricalTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -26,6 +24,8 @@ import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java index 7977515789..3d599afc28 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,10 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fasterxml.jackson.databind.JsonNode; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +39,7 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.fasterxml.jackson.databind.JsonNode; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java index 0990829a97..56f22358bf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,17 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import com.fasterxml.jackson.core.json.JsonWriteFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; import org.junit.Test; import org.springframework.integration.mapping.support.JsonHeaders; @@ -33,11 +36,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; -import com.fasterxml.jackson.core.json.JsonWriteFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/SimpleJsonSerializerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/SimpleJsonSerializerTests.java index ded511b850..b040775622 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/SimpleJsonSerializerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/SimpleJsonSerializerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.json; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.support.json.JsonObjectMapperProvider; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/TestAddress.java b/spring-integration-core/src/test/java/org/springframework/integration/json/TestAddress.java index 42fc7ec8c2..b07417e950 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/TestAddress.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/TestAddress.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.integration.json; /** * @author Mark Fisher * @since 2.0 -*/ + */ class TestAddress { private volatile int number; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/TestPerson.java b/spring-integration-core/src/test/java/org/springframework/integration/json/TestPerson.java index a8e0682e18..aea58fa642 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/TestPerson.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/TestPerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package org.springframework.integration.json; /** * @author Mark Fisher * @since 2.0 -*/ + */ public class TestPerson { private volatile String firstName; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/mapping/HeaderMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/mapping/HeaderMapperTests.java index a5cb770c49..39d51da102 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/mapping/HeaderMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/mapping/HeaderMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.mapping; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -36,6 +34,8 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.MessageHeaders; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stephane Nicoll * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java index c757caa02f..98e7dcff4f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.HashMap; import org.junit.Before; @@ -33,6 +30,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java index 36f6f7d110..8156eca776 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -26,6 +24,8 @@ import org.junit.Test; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderAtConfigTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderAtConfigTests.java index a1a482ce01..637eaebebb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderAtConfigTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderAtConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +38,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java index 0a126d186d..e9de78440d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -41,6 +39,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java index 593e114531..d1237f7f67 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -31,6 +28,9 @@ import org.junit.jupiter.api.Test; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java index 531f93695d..f649892e70 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.concurrent.BlockingQueue; import java.util.concurrent.SynchronousQueue; @@ -40,6 +34,12 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java index a09d57b72e..dc919b6608 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.HashMap; import java.util.Map; @@ -32,6 +29,9 @@ import org.springframework.integration.endpoint.MethodInvokingMessageSource; import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java index 9bcedb56ab..aa1ebd2034 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.message; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -40,6 +36,10 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Headers; import org.springframework.messaging.handler.annotation.Payload; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java index a2b58d92c2..9fc35c1b14 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.message.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.selector.PayloadTypeSelector; @@ -25,6 +23,8 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java index 386aafff8c..1498bb42b8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.message.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.selector.UnexpiredMessageSelector; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/metadata/PropertiesPersistingMetadataStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/metadata/PropertiesPersistingMetadataStoreTests.java index 1e29cba207..e01733c73d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/metadata/PropertiesPersistingMetadataStoreTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/metadata/PropertiesPersistingMetadataStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.metadata; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Properties; @@ -28,6 +26,8 @@ import org.junit.rules.TemporaryFolder; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.support.PropertiesLoaderUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java index cc99c67247..37b8a916d1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.resource; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Collection; @@ -35,6 +33,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.util.CollectionFilter; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index ed96ede88b..36e537d546 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,6 +32,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java index 0763dd7b96..bc25ccd3f2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.beans.factory.support.ManagedMap; @@ -30,6 +28,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.core.DestinationResolver; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -90,7 +90,7 @@ public class HeaderValueRouterTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void resolveChannelNameFromMap() { StaticApplicationContext context = new StaticApplicationContext(); ManagedMap channelMappings = new ManagedMap(); @@ -114,7 +114,7 @@ public class HeaderValueRouterTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void resolveChannelNameFromMapAndCustomeResolver() { final StaticApplicationContext context = new StaticApplicationContext(); ManagedMap channelMappings = new ManagedMap(); @@ -152,7 +152,7 @@ public class HeaderValueRouterTests { context.registerBeanDefinition("channel2", new RootBeanDefinition(QueueChannel.class)); context.refresh(); MessageHandler handler = (MessageHandler) context.getBean("router"); - String[] channels = new String[] { "channel1", "channel2" }; + String[] channels = new String[] {"channel1", "channel2"}; Message message = MessageBuilder.withPayload("test").setHeader("testHeaderName", channels).build(); handler.handleMessage(message); QueueChannel channel1 = (QueueChannel) context.getBean("channel1"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index 2a7800631c..5d8c817bae 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -38,6 +34,10 @@ import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index 00b264deb9..e6dc9aac36 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -32,6 +29,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index a2420c56a3..e5aaf18243 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.Serializable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -31,6 +28,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java index 2a05a7b65f..899d26dba7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -41,6 +37,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java index e05574b5c3..d8f867b5db 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -38,6 +34,10 @@ import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java index 630b7c4b32..0124475024 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.router; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -36,6 +33,9 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Oleg Zhurakousky @@ -366,8 +366,8 @@ public class RouterTests { protected List getChannelKeys(Message message) { - MessageChannel[] channelNames1 = new MessageChannel[] { testChannel1 }; - MessageChannel[] channelNames2 = new MessageChannel[] { testChannel2 }; + MessageChannel[] channelNames1 = new MessageChannel[] {testChannel1}; + MessageChannel[] channelNames2 = new MessageChannel[] {testChannel2}; List listWithListOfChannelNames = new ArrayList<>(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java index 6cb22eea33..a80358f36b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java index 4f0158f30c..b53310ba33 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java index 6bdbfc5fd3..1e46432534 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java index 5cd8b69a70..0ab0d66deb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java index f42b6d138b..c9a176f0e9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import org.junit.Test; @@ -35,6 +33,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky */ @@ -53,8 +53,8 @@ public class PayloadTypeRouterParserTests { context.start(); Message message1 = MessageBuilder.withPayload("Hello").build(); Message message2 = MessageBuilder.withPayload(25).build(); - Message message3 = MessageBuilder.withPayload(new Integer[] { 23, 24, 34 }).build(); - Message message4 = MessageBuilder.withPayload(new Long[] { 23L, 24L, 34L }).build(); + Message message3 = MessageBuilder.withPayload(new Integer[] {23, 24, 34}).build(); + Message message4 = MessageBuilder.withPayload(new Long[] {23L, 24L, 34L}).build(); testService.foo(message1); testService.foo(message2); testService.foo(message3); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java index 274a97e38d..2fa5edec17 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterFactoryBeanTests.java index 5536891a93..469d4e5142 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.channel.QueueChannel; @@ -26,6 +24,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 850f66cd24..e8fb752940 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.Collections; import java.util.List; @@ -48,6 +42,12 @@ import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Jonas Partner @@ -284,7 +284,6 @@ public class RouterParserTests { return (String) message.getPayload(); } - } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java index 806d33bc2f..3d9b25bc8c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +31,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java index 2fdab7bc19..5291838743 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artme Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java index 722aff087f..3a7b015108 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -30,6 +28,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java index 904a51d627..cb521c5e7d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.router.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/routingslip/RoutingSlipTests.java b/spring-integration-core/src/test/java/org/springframework/integration/routingslip/RoutingSlipTests.java index eb3905df5d..644e758102 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/routingslip/RoutingSlipTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/routingslip/RoutingSlipTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.routingslip; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -28,6 +25,7 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -54,7 +52,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.support.GenericXmlContextLoader; -import reactor.core.publisher.Flux; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** @@ -132,7 +131,7 @@ public class RoutingSlipTests { public static class TestRoutingSlipRoutePojo { - final String[] channels = { "channel2", "channel3" }; + final String[] channels = {"channel2", "channel3"}; private int i = 0; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherParserTests.java index 43f2323589..4232a5ce98 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scattergather.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.junit.Test; @@ -36,6 +34,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Abdul Zaheer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java index 4115c7cad9..b80b307bf0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/scattergather/config/ScatterGatherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scattergather.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -33,6 +31,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java index b0eb767a9b..a5ffbc891a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.core.MessageSelector; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/selector/MetadataStoreSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/selector/MetadataStoreSelectorTests.java index bc659cf6c7..e2f2640967 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/selector/MetadataStoreSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/selector/MetadataStoreSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.integration.metadata.SimpleMetadataStore; import org.springframework.messaging.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.3 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java index 4977d7295b..ea055d8718 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Arrays; import java.util.Collections; @@ -25,6 +23,8 @@ import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; @@ -35,8 +35,7 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher @@ -48,7 +47,7 @@ class DefaultSplitterTests { @Test void splitMessageWithArrayPayload() { - String[] payload = new String[] { "x", "y", "z" }; + String[] payload = new String[] {"x", "y", "z"}; Message message = MessageBuilder.withPayload(payload).build(); QueueChannel replyChannel = new QueueChannel(); DefaultMessageSplitter splitter = new DefaultMessageSplitter(); @@ -159,7 +158,7 @@ class DefaultSplitterTests { @Test void splitArrayPayloadReactive() { - Message message = new GenericMessage<>(new String[] { "x", "y", "z" }); + Message message = new GenericMessage<>(new String[] {"x", "y", "z"}); FluxMessageChannel replyChannel = new FluxMessageChannel(); Flux testFlux = diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java index cbf31d0bd7..c194cb814b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java index fc9d119ba1..decf8545e2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -41,6 +38,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java index 15f50c76db..7a58116e4b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -34,6 +32,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java index 5cfe0a70c2..563149e2e5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -41,6 +38,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Iwein Fuld * @author Alexander Peters diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/StreamingSplitterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/StreamingSplitterTests.java index 208f25968f..880318248e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/StreamingSplitterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/StreamingSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.splitter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -39,6 +36,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Alex Peters * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java index 6be0bad327..7e2d927deb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.spy; - import java.util.HashSet; import java.util.Set; import java.util.concurrent.CompletionService; @@ -37,6 +33,10 @@ import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.spy; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests.java index de0989df43..bcd5afce62 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Dave Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java index 6dc86b550b..a37c037c16 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -31,6 +29,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.util.ReflectionTestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell @@ -41,7 +41,8 @@ public class MessageStoreTests { @Test public void shouldRegisterCallbacks() throws Exception { TestMessageStore store = new TestMessageStore(); - store.setExpiryCallbacks(Collections.singletonList((messageGroupStore, group) -> { })); + store.setExpiryCallbacks(Collections.singletonList((messageGroupStore, group) -> { + })); assertThat(((Collection) ReflectionTestUtils.getField(store, "expiryCallbacks")).size()).isEqualTo(1); } @@ -73,7 +74,7 @@ public class MessageStoreTests { assertThat(store.getMessageCountForAllMessageGroups()).isEqualTo(1); } - private static class TestMessageStore extends SimpleMessageStore { + private static class TestMessageStore extends SimpleMessageStore { MessageGroup testMessages = new SimpleMessageGroup(Collections.singletonList(new GenericMessage("foo")), "bar"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java index f03591e7af..1187a29e1e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2019 the original author or authors. + * Copyright 2009-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; @@ -34,6 +30,10 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; + /** * @author Iwein Fuld * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java index 6b59ad6c36..8d33d30ba4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -37,6 +34,9 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.util.ReflectionTestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Iwein Fuld * @author Dave Syer @@ -253,7 +253,8 @@ public class SimpleMessageStoreTests { @Test public void shouldRegisterCallbacks() throws Exception { SimpleMessageStore store = new SimpleMessageStore(); - store.setExpiryCallbacks(Arrays.asList((messageGroupStore, group) -> { })); + store.setExpiryCallbacks(Arrays.asList((messageGroupStore, group) -> { + })); assertThat(((Collection) ReflectionTestUtils.getField(store, "expiryCallbacks")).size()).isEqualTo(1); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/MessageBuilderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/MessageBuilderTests.java index c10d3baaed..dcec01ce77 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/MessageBuilderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/MessageBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.support; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.3.10 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/MessageScenariosTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/MessageScenariosTests.java index ac80c5e4a1..7efb158ae0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/MessageScenariosTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/MessageScenariosTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -30,6 +28,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; +import static org.assertj.core.api.Assertions.assertThat; + @ContextConfiguration public class MessageScenariosTests extends AbstractRequestResponseScenarioTests { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/MutableMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/MutableMessageTests.java index a476fedd90..16b1a24032 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/MutableMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/MutableMessageTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; @@ -27,6 +25,8 @@ import org.junit.Test; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stuart Williams diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/SingleScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/SingleScenarioTests.java index e327ceba57..a7cbb6fe03 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/SingleScenarioTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/SingleScenarioTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.support; -import static org.assertj.core.api.Assertions.assertThat; - import org.springframework.integration.test.support.PayloadValidator; import org.springframework.integration.test.support.RequestResponseScenario; import org.springframework.integration.test.support.SingleRequestResponseScenarioTests; import org.springframework.test.context.ContextConfiguration; +import static org.assertj.core.api.Assertions.assertThat; + @ContextConfiguration("MessageScenariosTests-context.xml") public class SingleScenarioTests extends SingleRequestResponseScenarioTests { @@ -30,13 +30,13 @@ public class SingleScenarioTests extends SingleRequestResponseScenarioTests { protected RequestResponseScenario defineRequestResponseScenario() { RequestResponseScenario scenario = new RequestResponseScenario( "inputChannel", "outputChannel") - .setPayload("hello") - .setResponseValidator(new PayloadValidator() { - @Override - protected void validateResponse(String response) { - assertThat(response).isEqualTo("HELLO"); - } - }); + .setPayload("hello") + .setResponseValidator(new PayloadValidator() { + @Override + protected void validateResponse(String response) { + assertThat(response).isEqualTo("HELLO"); + } + }); return scenario; } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/SmartLifecycleRoleControllerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/SmartLifecycleRoleControllerTests.java index a30bb5591d..45866b1773 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/SmartLifecycleRoleControllerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/SmartLifecycleRoleControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.junit.Test; import org.mockito.InOrder; @@ -29,6 +24,11 @@ import org.springframework.integration.support.context.NamedComponent; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java index 6675fb3d2d..f7d5a6fe22 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.support.converter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Map; import org.junit.Test; @@ -26,6 +23,9 @@ import org.junit.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan @@ -43,7 +43,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message, Map.class); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); @@ -77,7 +77,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message, Map.class); + Map map = (Map) converter.fromMessage(message, Map.class); map.remove("payload"); @@ -97,7 +97,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message, Map.class); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); @@ -116,7 +116,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message, Map.class); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java index f657dd415d..0f0f32ab80 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/json/EmbeddedJsonHeadersMessageMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,19 @@ package org.springframework.integration.support.json; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.ByteBuffer; import java.util.Collections; import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell @@ -136,7 +135,7 @@ public class EmbeddedJsonHeadersMessageMapperTests { @Test public void testDontMapIdButOthers() throws Exception { EmbeddedJsonHeadersMessageMapper mapper = new EmbeddedJsonHeadersMessageMapper("!" + MessageHeaders.ID, "*"); - GenericMessage message = new GenericMessage<>("foo", Collections.singletonMap("bar", "baz")); + GenericMessage message = new GenericMessage<>("foo", Collections.singletonMap("bar", "baz")); byte[] encodedMessage = mapper.fromMessage(message); ObjectMapper objectMapper = new ObjectMapper(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiatorTests.java index 3fc9a49d7f..15fbcd1f68 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/leader/LockRegistryLeaderInitiatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,6 @@ package org.springframework.integration.support.leader; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -49,6 +39,16 @@ import org.springframework.integration.support.locks.DefaultLockRegistry; import org.springframework.integration.support.locks.LockRegistry; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/locks/DefaultLockRegistryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/locks/DefaultLockRegistryTests.java index dbff295f97..d9de078724 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/locks/DefaultLockRegistryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/locks/DefaultLockRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.support.locks; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.locks.Lock; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/IntegrationManagementConfigurerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/IntegrationManagementConfigurerTests.java index b8d4966fa7..eb202675ee 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/IntegrationManagementConfigurerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/IntegrationManagementConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.support.management; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.HashMap; import java.util.Map; @@ -40,6 +36,10 @@ import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.router.RecipientListRouter; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java index 4e0b9a44ae..9292885e78 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerCustomMetricsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package org.springframework.integration.support.management.micrometer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.search.MeterNotFoundException; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +34,8 @@ import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.search.MeterNotFoundException; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java index 8e235cc9ce..9c5ac65092 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/micrometer/MicrometerMetricsTests.java @@ -16,11 +16,12 @@ package org.springframework.integration.support.management.micrometer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Set; +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.config.MeterFilter; +import io.micrometer.core.instrument.search.MeterNotFoundException; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -56,10 +57,8 @@ import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.config.MeterFilter; -import io.micrometer.core.instrument.search.MeterNotFoundException; -import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Gary Russell @@ -197,7 +196,8 @@ public class MicrometerMetricsTests { BeanDefinitionBuilder.genericBeanDefinition(DirectChannel.class).getRawBeanDefinition()); DirectChannel newChannel = this.context.getBean("newChannel", DirectChannel.class); newChannel.setBeanName("newChannel"); - newChannel.subscribe(m -> { }); + newChannel.subscribe(m -> { + }); newChannel.send(new GenericMessage<>("foo")); assertThat(registry.get("spring.integration.send") .tag("name", "newChannel") diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/management/observation/IntegrationObservabilityZipkinTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/management/observation/IntegrationObservabilityZipkinTests.java index 63fdde1a59..d0368a3abc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/management/observation/IntegrationObservabilityZipkinTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/management/observation/IntegrationObservabilityZipkinTests.java @@ -16,11 +16,16 @@ package org.springframework.integration.support.management.observation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import io.micrometer.common.KeyValues; +import io.micrometer.core.tck.MeterRegistryAssert; +import io.micrometer.observation.ObservationRegistry; +import io.micrometer.tracing.Span; +import io.micrometer.tracing.test.SampleTestRunner; +import io.micrometer.tracing.test.simple.SpansAssert; + import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -41,12 +46,7 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.GenericMessage; -import io.micrometer.common.KeyValues; -import io.micrometer.core.tck.MeterRegistryAssert; -import io.micrometer.observation.ObservationRegistry; -import io.micrometer.tracing.Span; -import io.micrometer.tracing.test.SampleTestRunner; -import io.micrometer.tracing.test.simple.SpansAssert; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -57,7 +57,7 @@ public class IntegrationObservabilityZipkinTests extends SampleTestRunner { @Override public TracingSetup[] getTracingSetup() { - return new TracingSetup[]{ TracingSetup.IN_MEMORY_BRAVE, TracingSetup.ZIPKIN_BRAVE }; + return new TracingSetup[] {TracingSetup.IN_MEMORY_BRAVE, TracingSetup.ZIPKIN_BRAVE}; } @Override diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/mutable/MutableMessageBuilderFactoryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/mutable/MutableMessageBuilderFactoryTests.java index 0542ccccf1..3b0e0ab7c0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/mutable/MutableMessageBuilderFactoryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/mutable/MutableMessageBuilderFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.support.mutable; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -41,6 +39,8 @@ import org.springframework.messaging.handler.annotation.Payload; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stuart Williams diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java index 4e0ba48d5c..49629f3659 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transaction; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.interceptor.TransactionAttribute; import org.springframework.transaction.interceptor.TransactionInterceptor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass1.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass1.java index 3c172f258f..c573f9c30f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass1.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass1.java @@ -5,304 +5,325 @@ */ package org.springframework.integration.transformer; -import org.apache.avro.specific.SpecificData; -import org.apache.avro.message.BinaryMessageEncoder; import org.apache.avro.message.BinaryMessageDecoder; +import org.apache.avro.message.BinaryMessageEncoder; import org.apache.avro.message.SchemaStore; +import org.apache.avro.specific.SpecificData; @SuppressWarnings("all") @org.apache.avro.specific.AvroGenerated public class AvroTestClass1 extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = 72441923701471492L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AvroTestClass1\",\"namespace\":\"org.springframework.integration.transformer\",\"fields\":[{\"name\":\"bar\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"qux\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}"); - public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } + private static final long serialVersionUID = 72441923701471492L; - private static SpecificData MODEL$ = new SpecificData(); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AvroTestClass1\",\"namespace\":\"org.springframework.integration.transformer\",\"fields\":[{\"name\":\"bar\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"qux\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}"); - private static final BinaryMessageEncoder ENCODER = - new BinaryMessageEncoder(MODEL$, SCHEMA$); + public static org.apache.avro.Schema getClassSchema() { + return SCHEMA$; + } - private static final BinaryMessageDecoder DECODER = - new BinaryMessageDecoder(MODEL$, SCHEMA$); + private static SpecificData MODEL$ = new SpecificData(); - /** - * Return the BinaryMessageDecoder instance used by this class. - */ - public static BinaryMessageDecoder getDecoder() { - return DECODER; - } + private static final BinaryMessageEncoder ENCODER = + new BinaryMessageEncoder(MODEL$, SCHEMA$); - /** - * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. - * @param resolver a {@link SchemaStore} used to find schemas by fingerprint - */ - public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { - return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); - } + private static final BinaryMessageDecoder DECODER = + new BinaryMessageDecoder(MODEL$, SCHEMA$); - /** Serializes this AvroTestClass1 to a ByteBuffer. */ - public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { - return ENCODER.encode(this); - } + /** + * Return the BinaryMessageDecoder instance used by this class. + */ + public static BinaryMessageDecoder getDecoder() { + return DECODER; + } - /** Deserializes a AvroTestClass1 from a ByteBuffer. */ - public static AvroTestClass1 fromByteBuffer( - java.nio.ByteBuffer b) throws java.io.IOException { - return DECODER.decode(b); - } + /** + * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. + * @param resolver a {@link SchemaStore} used to find schemas by fingerprint + */ + public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { + return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + } - @Deprecated public java.lang.String bar; - @Deprecated public java.lang.String qux; + /** Serializes this AvroTestClass1 to a ByteBuffer. */ + public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + return ENCODER.encode(this); + } - /** - * Default constructor. Note that this does not initialize fields - * to their default values from the schema. If that is desired then - * one should use newBuilder(). - */ - public AvroTestClass1() {} + /** Deserializes a AvroTestClass1 from a ByteBuffer. */ + public static AvroTestClass1 fromByteBuffer( + java.nio.ByteBuffer b) throws java.io.IOException { + return DECODER.decode(b); + } - /** - * All-args constructor. - * @param bar The new value for bar - * @param qux The new value for qux - */ - public AvroTestClass1(java.lang.String bar, java.lang.String qux) { - this.bar = bar; - this.qux = qux; - } + @Deprecated public java.lang.String bar; - public org.apache.avro.Schema getSchema() { return SCHEMA$; } - // Used by DatumWriter. Applications should not call. - public java.lang.Object get(int field$) { - switch (field$) { - case 0: return bar; - case 1: return qux; - default: throw new org.apache.avro.AvroRuntimeException("Bad index"); - } - } + @Deprecated public java.lang.String qux; - // Used by DatumReader. Applications should not call. - @SuppressWarnings(value="unchecked") - public void put(int field$, java.lang.Object value$) { - switch (field$) { - case 0: bar = (java.lang.String)value$; break; - case 1: qux = (java.lang.String)value$; break; - default: throw new org.apache.avro.AvroRuntimeException("Bad index"); - } - } + /** + * Default constructor. Note that this does not initialize fields + * to their default values from the schema. If that is desired then + * one should use newBuilder(). + */ + public AvroTestClass1() { + } - /** - * Gets the value of the 'bar' field. - * @return The value of the 'bar' field. - */ - public java.lang.String getBar() { - return bar; - } + /** + * All-args constructor. + * @param bar The new value for bar + * @param qux The new value for qux + */ + public AvroTestClass1(java.lang.String bar, java.lang.String qux) { + this.bar = bar; + this.qux = qux; + } - /** - * Sets the value of the 'bar' field. - * @param value the value to set. - */ - public void setBar(java.lang.String value) { - this.bar = value; - } + public org.apache.avro.Schema getSchema() { + return SCHEMA$; + } - /** - * Gets the value of the 'qux' field. - * @return The value of the 'qux' field. - */ - public java.lang.String getQux() { - return qux; - } + // Used by DatumWriter. Applications should not call. + public java.lang.Object get(int field$) { + switch (field$) { + case 0: + return bar; + case 1: + return qux; + default: + throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } - /** - * Sets the value of the 'qux' field. - * @param value the value to set. - */ - public void setQux(java.lang.String value) { - this.qux = value; - } + // Used by DatumReader. Applications should not call. + @SuppressWarnings(value = "unchecked") + public void put(int field$, java.lang.Object value$) { + switch (field$) { + case 0: + bar = (java.lang.String) value$; + break; + case 1: + qux = (java.lang.String) value$; + break; + default: + throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } - /** - * Creates a new AvroTestClass1 RecordBuilder. - * @return A new AvroTestClass1 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder() { - return new org.springframework.integration.transformer.AvroTestClass1.Builder(); - } + /** + * Gets the value of the 'bar' field. + * @return The value of the 'bar' field. + */ + public java.lang.String getBar() { + return bar; + } - /** - * Creates a new AvroTestClass1 RecordBuilder by copying an existing Builder. - * @param other The existing builder to copy. - * @return A new AvroTestClass1 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass1.Builder other) { - return new org.springframework.integration.transformer.AvroTestClass1.Builder(other); - } + /** + * Sets the value of the 'bar' field. + * @param value the value to set. + */ + public void setBar(java.lang.String value) { + this.bar = value; + } - /** - * Creates a new AvroTestClass1 RecordBuilder by copying an existing AvroTestClass1 instance. - * @param other The existing instance to copy. - * @return A new AvroTestClass1 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass1 other) { - return new org.springframework.integration.transformer.AvroTestClass1.Builder(other); - } + /** + * Gets the value of the 'qux' field. + * @return The value of the 'qux' field. + */ + public java.lang.String getQux() { + return qux; + } - /** - * RecordBuilder for AvroTestClass1 instances. - */ - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + /** + * Sets the value of the 'qux' field. + * @param value the value to set. + */ + public void setQux(java.lang.String value) { + this.qux = value; + } - private java.lang.String bar; - private java.lang.String qux; + /** + * Creates a new AvroTestClass1 RecordBuilder. + * @return A new AvroTestClass1 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder() { + return new org.springframework.integration.transformer.AvroTestClass1.Builder(); + } - /** Creates a new Builder */ - private Builder() { - super(SCHEMA$); - } + /** + * Creates a new AvroTestClass1 RecordBuilder by copying an existing Builder. + * @param other The existing builder to copy. + * @return A new AvroTestClass1 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass1.Builder other) { + return new org.springframework.integration.transformer.AvroTestClass1.Builder(other); + } - /** - * Creates a Builder by copying an existing Builder. - * @param other The existing Builder to copy. - */ - private Builder(org.springframework.integration.transformer.AvroTestClass1.Builder other) { - super(other); - if (isValidValue(fields()[0], other.bar)) { - this.bar = data().deepCopy(fields()[0].schema(), other.bar); - fieldSetFlags()[0] = true; - } - if (isValidValue(fields()[1], other.qux)) { - this.qux = data().deepCopy(fields()[1].schema(), other.qux); - fieldSetFlags()[1] = true; - } - } + /** + * Creates a new AvroTestClass1 RecordBuilder by copying an existing AvroTestClass1 instance. + * @param other The existing instance to copy. + * @return A new AvroTestClass1 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass1.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass1 other) { + return new org.springframework.integration.transformer.AvroTestClass1.Builder(other); + } - /** - * Creates a Builder by copying an existing AvroTestClass1 instance - * @param other The existing instance to copy. - */ - private Builder(org.springframework.integration.transformer.AvroTestClass1 other) { - super(SCHEMA$); - if (isValidValue(fields()[0], other.bar)) { - this.bar = data().deepCopy(fields()[0].schema(), other.bar); - fieldSetFlags()[0] = true; - } - if (isValidValue(fields()[1], other.qux)) { - this.qux = data().deepCopy(fields()[1].schema(), other.qux); - fieldSetFlags()[1] = true; - } - } + /** + * RecordBuilder for AvroTestClass1 instances. + */ + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { - /** - * Gets the value of the 'bar' field. - * @return The value. - */ - public java.lang.String getBar() { - return bar; - } + private java.lang.String bar; - /** - * Sets the value of the 'bar' field. - * @param value The value of 'bar'. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass1.Builder setBar(java.lang.String value) { - validate(fields()[0], value); - this.bar = value; - fieldSetFlags()[0] = true; - return this; - } + private java.lang.String qux; - /** - * Checks whether the 'bar' field has been set. - * @return True if the 'bar' field has been set, false otherwise. - */ - public boolean hasBar() { - return fieldSetFlags()[0]; - } + /** Creates a new Builder */ + private Builder() { + super(SCHEMA$); + } + + /** + * Creates a Builder by copying an existing Builder. + * @param other The existing Builder to copy. + */ + private Builder(org.springframework.integration.transformer.AvroTestClass1.Builder other) { + super(other); + if (isValidValue(fields()[0], other.bar)) { + this.bar = data().deepCopy(fields()[0].schema(), other.bar); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.qux)) { + this.qux = data().deepCopy(fields()[1].schema(), other.qux); + fieldSetFlags()[1] = true; + } + } + + /** + * Creates a Builder by copying an existing AvroTestClass1 instance + * @param other The existing instance to copy. + */ + private Builder(org.springframework.integration.transformer.AvroTestClass1 other) { + super(SCHEMA$); + if (isValidValue(fields()[0], other.bar)) { + this.bar = data().deepCopy(fields()[0].schema(), other.bar); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.qux)) { + this.qux = data().deepCopy(fields()[1].schema(), other.qux); + fieldSetFlags()[1] = true; + } + } + + /** + * Gets the value of the 'bar' field. + * @return The value. + */ + public java.lang.String getBar() { + return bar; + } + + /** + * Sets the value of the 'bar' field. + * @param value The value of 'bar'. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass1.Builder setBar(java.lang.String value) { + validate(fields()[0], value); + this.bar = value; + fieldSetFlags()[0] = true; + return this; + } + + /** + * Checks whether the 'bar' field has been set. + * @return True if the 'bar' field has been set, false otherwise. + */ + public boolean hasBar() { + return fieldSetFlags()[0]; + } - /** - * Clears the value of the 'bar' field. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass1.Builder clearBar() { - bar = null; - fieldSetFlags()[0] = false; - return this; - } + /** + * Clears the value of the 'bar' field. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass1.Builder clearBar() { + bar = null; + fieldSetFlags()[0] = false; + return this; + } - /** - * Gets the value of the 'qux' field. - * @return The value. - */ - public java.lang.String getQux() { - return qux; - } + /** + * Gets the value of the 'qux' field. + * @return The value. + */ + public java.lang.String getQux() { + return qux; + } - /** - * Sets the value of the 'qux' field. - * @param value The value of 'qux'. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass1.Builder setQux(java.lang.String value) { - validate(fields()[1], value); - this.qux = value; - fieldSetFlags()[1] = true; - return this; - } + /** + * Sets the value of the 'qux' field. + * @param value The value of 'qux'. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass1.Builder setQux(java.lang.String value) { + validate(fields()[1], value); + this.qux = value; + fieldSetFlags()[1] = true; + return this; + } - /** - * Checks whether the 'qux' field has been set. - * @return True if the 'qux' field has been set, false otherwise. - */ - public boolean hasQux() { - return fieldSetFlags()[1]; - } + /** + * Checks whether the 'qux' field has been set. + * @return True if the 'qux' field has been set, false otherwise. + */ + public boolean hasQux() { + return fieldSetFlags()[1]; + } - /** - * Clears the value of the 'qux' field. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass1.Builder clearQux() { - qux = null; - fieldSetFlags()[1] = false; - return this; - } + /** + * Clears the value of the 'qux' field. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass1.Builder clearQux() { + qux = null; + fieldSetFlags()[1] = false; + return this; + } - @Override - @SuppressWarnings("unchecked") - public AvroTestClass1 build() { - try { - AvroTestClass1 record = new AvroTestClass1(); - record.bar = fieldSetFlags()[0] ? this.bar : (java.lang.String) defaultValue(fields()[0]); - record.qux = fieldSetFlags()[1] ? this.qux : (java.lang.String) defaultValue(fields()[1]); - return record; - } catch (java.lang.Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); - } - } - } + @Override + @SuppressWarnings("unchecked") + public AvroTestClass1 build() { + try { + AvroTestClass1 record = new AvroTestClass1(); + record.bar = fieldSetFlags()[0] ? this.bar : (java.lang.String) defaultValue(fields()[0]); + record.qux = fieldSetFlags()[1] ? this.qux : (java.lang.String) defaultValue(fields()[1]); + return record; + } + catch (java.lang.Exception e) { + throw new org.apache.avro.AvroRuntimeException(e); + } + } + } - @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumWriter - WRITER$ = (org.apache.avro.io.DatumWriter)MODEL$.createDatumWriter(SCHEMA$); + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumWriter + WRITER$ = (org.apache.avro.io.DatumWriter) MODEL$.createDatumWriter(SCHEMA$); - @Override public void writeExternal(java.io.ObjectOutput out) - throws java.io.IOException { - WRITER$.write(this, SpecificData.getEncoder(out)); - } + @Override + public void writeExternal(java.io.ObjectOutput out) + throws java.io.IOException { + WRITER$.write(this, SpecificData.getEncoder(out)); + } - @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumReader - READER$ = (org.apache.avro.io.DatumReader)MODEL$.createDatumReader(SCHEMA$); + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumReader + READER$ = (org.apache.avro.io.DatumReader) MODEL$.createDatumReader(SCHEMA$); - @Override public void readExternal(java.io.ObjectInput in) - throws java.io.IOException { - READER$.read(this, SpecificData.getDecoder(in)); - } + @Override + public void readExternal(java.io.ObjectInput in) + throws java.io.IOException { + READER$.read(this, SpecificData.getDecoder(in)); + } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass2.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass2.java index 42bfc1c913..b546c3cc59 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass2.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTestClass2.java @@ -5,304 +5,325 @@ */ package org.springframework.integration.transformer; -import org.apache.avro.specific.SpecificData; -import org.apache.avro.message.BinaryMessageEncoder; import org.apache.avro.message.BinaryMessageDecoder; +import org.apache.avro.message.BinaryMessageEncoder; import org.apache.avro.message.SchemaStore; +import org.apache.avro.specific.SpecificData; @SuppressWarnings("all") @org.apache.avro.specific.AvroGenerated public class AvroTestClass2 extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = -5029139830458327575L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AvroTestClass2\",\"namespace\":\"org.springframework.integration.transformer\",\"fields\":[{\"name\":\"bar\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"qux\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}"); - public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } + private static final long serialVersionUID = -5029139830458327575L; - private static SpecificData MODEL$ = new SpecificData(); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"AvroTestClass2\",\"namespace\":\"org.springframework.integration.transformer\",\"fields\":[{\"name\":\"bar\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}]},{\"name\":\"qux\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}"); - private static final BinaryMessageEncoder ENCODER = - new BinaryMessageEncoder(MODEL$, SCHEMA$); + public static org.apache.avro.Schema getClassSchema() { + return SCHEMA$; + } - private static final BinaryMessageDecoder DECODER = - new BinaryMessageDecoder(MODEL$, SCHEMA$); + private static SpecificData MODEL$ = new SpecificData(); - /** - * Return the BinaryMessageDecoder instance used by this class. - */ - public static BinaryMessageDecoder getDecoder() { - return DECODER; - } + private static final BinaryMessageEncoder ENCODER = + new BinaryMessageEncoder(MODEL$, SCHEMA$); - /** - * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. - * @param resolver a {@link SchemaStore} used to find schemas by fingerprint - */ - public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { - return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); - } + private static final BinaryMessageDecoder DECODER = + new BinaryMessageDecoder(MODEL$, SCHEMA$); - /** Serializes this AvroTestClass2 to a ByteBuffer. */ - public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { - return ENCODER.encode(this); - } + /** + * Return the BinaryMessageDecoder instance used by this class. + */ + public static BinaryMessageDecoder getDecoder() { + return DECODER; + } - /** Deserializes a AvroTestClass2 from a ByteBuffer. */ - public static AvroTestClass2 fromByteBuffer( - java.nio.ByteBuffer b) throws java.io.IOException { - return DECODER.decode(b); - } + /** + * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. + * @param resolver a {@link SchemaStore} used to find schemas by fingerprint + */ + public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { + return new BinaryMessageDecoder(MODEL$, SCHEMA$, resolver); + } - @Deprecated public java.lang.String bar; - @Deprecated public java.lang.String qux; + /** Serializes this AvroTestClass2 to a ByteBuffer. */ + public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + return ENCODER.encode(this); + } - /** - * Default constructor. Note that this does not initialize fields - * to their default values from the schema. If that is desired then - * one should use newBuilder(). - */ - public AvroTestClass2() {} + /** Deserializes a AvroTestClass2 from a ByteBuffer. */ + public static AvroTestClass2 fromByteBuffer( + java.nio.ByteBuffer b) throws java.io.IOException { + return DECODER.decode(b); + } - /** - * All-args constructor. - * @param bar The new value for bar - * @param qux The new value for qux - */ - public AvroTestClass2(java.lang.String bar, java.lang.String qux) { - this.bar = bar; - this.qux = qux; - } + @Deprecated public java.lang.String bar; - public org.apache.avro.Schema getSchema() { return SCHEMA$; } - // Used by DatumWriter. Applications should not call. - public java.lang.Object get(int field$) { - switch (field$) { - case 0: return bar; - case 1: return qux; - default: throw new org.apache.avro.AvroRuntimeException("Bad index"); - } - } + @Deprecated public java.lang.String qux; - // Used by DatumReader. Applications should not call. - @SuppressWarnings(value="unchecked") - public void put(int field$, java.lang.Object value$) { - switch (field$) { - case 0: bar = (java.lang.String)value$; break; - case 1: qux = (java.lang.String)value$; break; - default: throw new org.apache.avro.AvroRuntimeException("Bad index"); - } - } + /** + * Default constructor. Note that this does not initialize fields + * to their default values from the schema. If that is desired then + * one should use newBuilder(). + */ + public AvroTestClass2() { + } - /** - * Gets the value of the 'bar' field. - * @return The value of the 'bar' field. - */ - public java.lang.String getBar() { - return bar; - } + /** + * All-args constructor. + * @param bar The new value for bar + * @param qux The new value for qux + */ + public AvroTestClass2(java.lang.String bar, java.lang.String qux) { + this.bar = bar; + this.qux = qux; + } - /** - * Sets the value of the 'bar' field. - * @param value the value to set. - */ - public void setBar(java.lang.String value) { - this.bar = value; - } + public org.apache.avro.Schema getSchema() { + return SCHEMA$; + } - /** - * Gets the value of the 'qux' field. - * @return The value of the 'qux' field. - */ - public java.lang.String getQux() { - return qux; - } + // Used by DatumWriter. Applications should not call. + public java.lang.Object get(int field$) { + switch (field$) { + case 0: + return bar; + case 1: + return qux; + default: + throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } - /** - * Sets the value of the 'qux' field. - * @param value the value to set. - */ - public void setQux(java.lang.String value) { - this.qux = value; - } + // Used by DatumReader. Applications should not call. + @SuppressWarnings(value = "unchecked") + public void put(int field$, java.lang.Object value$) { + switch (field$) { + case 0: + bar = (java.lang.String) value$; + break; + case 1: + qux = (java.lang.String) value$; + break; + default: + throw new org.apache.avro.AvroRuntimeException("Bad index"); + } + } - /** - * Creates a new AvroTestClass2 RecordBuilder. - * @return A new AvroTestClass2 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder() { - return new org.springframework.integration.transformer.AvroTestClass2.Builder(); - } + /** + * Gets the value of the 'bar' field. + * @return The value of the 'bar' field. + */ + public java.lang.String getBar() { + return bar; + } - /** - * Creates a new AvroTestClass2 RecordBuilder by copying an existing Builder. - * @param other The existing builder to copy. - * @return A new AvroTestClass2 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass2.Builder other) { - return new org.springframework.integration.transformer.AvroTestClass2.Builder(other); - } + /** + * Sets the value of the 'bar' field. + * @param value the value to set. + */ + public void setBar(java.lang.String value) { + this.bar = value; + } - /** - * Creates a new AvroTestClass2 RecordBuilder by copying an existing AvroTestClass2 instance. - * @param other The existing instance to copy. - * @return A new AvroTestClass2 RecordBuilder - */ - public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass2 other) { - return new org.springframework.integration.transformer.AvroTestClass2.Builder(other); - } + /** + * Gets the value of the 'qux' field. + * @return The value of the 'qux' field. + */ + public java.lang.String getQux() { + return qux; + } - /** - * RecordBuilder for AvroTestClass2 instances. - */ - public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase - implements org.apache.avro.data.RecordBuilder { + /** + * Sets the value of the 'qux' field. + * @param value the value to set. + */ + public void setQux(java.lang.String value) { + this.qux = value; + } - private java.lang.String bar; - private java.lang.String qux; + /** + * Creates a new AvroTestClass2 RecordBuilder. + * @return A new AvroTestClass2 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder() { + return new org.springframework.integration.transformer.AvroTestClass2.Builder(); + } - /** Creates a new Builder */ - private Builder() { - super(SCHEMA$); - } + /** + * Creates a new AvroTestClass2 RecordBuilder by copying an existing Builder. + * @param other The existing builder to copy. + * @return A new AvroTestClass2 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass2.Builder other) { + return new org.springframework.integration.transformer.AvroTestClass2.Builder(other); + } - /** - * Creates a Builder by copying an existing Builder. - * @param other The existing Builder to copy. - */ - private Builder(org.springframework.integration.transformer.AvroTestClass2.Builder other) { - super(other); - if (isValidValue(fields()[0], other.bar)) { - this.bar = data().deepCopy(fields()[0].schema(), other.bar); - fieldSetFlags()[0] = true; - } - if (isValidValue(fields()[1], other.qux)) { - this.qux = data().deepCopy(fields()[1].schema(), other.qux); - fieldSetFlags()[1] = true; - } - } + /** + * Creates a new AvroTestClass2 RecordBuilder by copying an existing AvroTestClass2 instance. + * @param other The existing instance to copy. + * @return A new AvroTestClass2 RecordBuilder + */ + public static org.springframework.integration.transformer.AvroTestClass2.Builder newBuilder(org.springframework.integration.transformer.AvroTestClass2 other) { + return new org.springframework.integration.transformer.AvroTestClass2.Builder(other); + } - /** - * Creates a Builder by copying an existing AvroTestClass2 instance - * @param other The existing instance to copy. - */ - private Builder(org.springframework.integration.transformer.AvroTestClass2 other) { - super(SCHEMA$); - if (isValidValue(fields()[0], other.bar)) { - this.bar = data().deepCopy(fields()[0].schema(), other.bar); - fieldSetFlags()[0] = true; - } - if (isValidValue(fields()[1], other.qux)) { - this.qux = data().deepCopy(fields()[1].schema(), other.qux); - fieldSetFlags()[1] = true; - } - } + /** + * RecordBuilder for AvroTestClass2 instances. + */ + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { - /** - * Gets the value of the 'bar' field. - * @return The value. - */ - public java.lang.String getBar() { - return bar; - } + private java.lang.String bar; - /** - * Sets the value of the 'bar' field. - * @param value The value of 'bar'. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass2.Builder setBar(java.lang.String value) { - validate(fields()[0], value); - this.bar = value; - fieldSetFlags()[0] = true; - return this; - } + private java.lang.String qux; - /** - * Checks whether the 'bar' field has been set. - * @return True if the 'bar' field has been set, false otherwise. - */ - public boolean hasBar() { - return fieldSetFlags()[0]; - } + /** Creates a new Builder */ + private Builder() { + super(SCHEMA$); + } + + /** + * Creates a Builder by copying an existing Builder. + * @param other The existing Builder to copy. + */ + private Builder(org.springframework.integration.transformer.AvroTestClass2.Builder other) { + super(other); + if (isValidValue(fields()[0], other.bar)) { + this.bar = data().deepCopy(fields()[0].schema(), other.bar); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.qux)) { + this.qux = data().deepCopy(fields()[1].schema(), other.qux); + fieldSetFlags()[1] = true; + } + } + + /** + * Creates a Builder by copying an existing AvroTestClass2 instance + * @param other The existing instance to copy. + */ + private Builder(org.springframework.integration.transformer.AvroTestClass2 other) { + super(SCHEMA$); + if (isValidValue(fields()[0], other.bar)) { + this.bar = data().deepCopy(fields()[0].schema(), other.bar); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.qux)) { + this.qux = data().deepCopy(fields()[1].schema(), other.qux); + fieldSetFlags()[1] = true; + } + } + + /** + * Gets the value of the 'bar' field. + * @return The value. + */ + public java.lang.String getBar() { + return bar; + } + + /** + * Sets the value of the 'bar' field. + * @param value The value of 'bar'. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass2.Builder setBar(java.lang.String value) { + validate(fields()[0], value); + this.bar = value; + fieldSetFlags()[0] = true; + return this; + } + + /** + * Checks whether the 'bar' field has been set. + * @return True if the 'bar' field has been set, false otherwise. + */ + public boolean hasBar() { + return fieldSetFlags()[0]; + } - /** - * Clears the value of the 'bar' field. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass2.Builder clearBar() { - bar = null; - fieldSetFlags()[0] = false; - return this; - } + /** + * Clears the value of the 'bar' field. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass2.Builder clearBar() { + bar = null; + fieldSetFlags()[0] = false; + return this; + } - /** - * Gets the value of the 'qux' field. - * @return The value. - */ - public java.lang.String getQux() { - return qux; - } + /** + * Gets the value of the 'qux' field. + * @return The value. + */ + public java.lang.String getQux() { + return qux; + } - /** - * Sets the value of the 'qux' field. - * @param value The value of 'qux'. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass2.Builder setQux(java.lang.String value) { - validate(fields()[1], value); - this.qux = value; - fieldSetFlags()[1] = true; - return this; - } + /** + * Sets the value of the 'qux' field. + * @param value The value of 'qux'. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass2.Builder setQux(java.lang.String value) { + validate(fields()[1], value); + this.qux = value; + fieldSetFlags()[1] = true; + return this; + } - /** - * Checks whether the 'qux' field has been set. - * @return True if the 'qux' field has been set, false otherwise. - */ - public boolean hasQux() { - return fieldSetFlags()[1]; - } + /** + * Checks whether the 'qux' field has been set. + * @return True if the 'qux' field has been set, false otherwise. + */ + public boolean hasQux() { + return fieldSetFlags()[1]; + } - /** - * Clears the value of the 'qux' field. - * @return This builder. - */ - public org.springframework.integration.transformer.AvroTestClass2.Builder clearQux() { - qux = null; - fieldSetFlags()[1] = false; - return this; - } + /** + * Clears the value of the 'qux' field. + * @return This builder. + */ + public org.springframework.integration.transformer.AvroTestClass2.Builder clearQux() { + qux = null; + fieldSetFlags()[1] = false; + return this; + } - @Override - @SuppressWarnings("unchecked") - public AvroTestClass2 build() { - try { - AvroTestClass2 record = new AvroTestClass2(); - record.bar = fieldSetFlags()[0] ? this.bar : (java.lang.String) defaultValue(fields()[0]); - record.qux = fieldSetFlags()[1] ? this.qux : (java.lang.String) defaultValue(fields()[1]); - return record; - } catch (java.lang.Exception e) { - throw new org.apache.avro.AvroRuntimeException(e); - } - } - } + @Override + @SuppressWarnings("unchecked") + public AvroTestClass2 build() { + try { + AvroTestClass2 record = new AvroTestClass2(); + record.bar = fieldSetFlags()[0] ? this.bar : (java.lang.String) defaultValue(fields()[0]); + record.qux = fieldSetFlags()[1] ? this.qux : (java.lang.String) defaultValue(fields()[1]); + return record; + } + catch (java.lang.Exception e) { + throw new org.apache.avro.AvroRuntimeException(e); + } + } + } - @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumWriter - WRITER$ = (org.apache.avro.io.DatumWriter)MODEL$.createDatumWriter(SCHEMA$); + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumWriter + WRITER$ = (org.apache.avro.io.DatumWriter) MODEL$.createDatumWriter(SCHEMA$); - @Override public void writeExternal(java.io.ObjectOutput out) - throws java.io.IOException { - WRITER$.write(this, SpecificData.getEncoder(out)); - } + @Override + public void writeExternal(java.io.ObjectOutput out) + throws java.io.IOException { + WRITER$.write(this, SpecificData.getEncoder(out)); + } - @SuppressWarnings("unchecked") - private static final org.apache.avro.io.DatumReader - READER$ = (org.apache.avro.io.DatumReader)MODEL$.createDatumReader(SCHEMA$); + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumReader + READER$ = (org.apache.avro.io.DatumReader) MODEL$.createDatumReader(SCHEMA$); - @Override public void readExternal(java.io.ObjectInput in) - throws java.io.IOException { - READER$.read(this, SpecificData.getDecoder(in)); - } + @Override + public void readExternal(java.io.ObjectInput in) + throws java.io.IOException { + READER$.read(this, SpecificData.getDecoder(in)); + } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTests.java index 3370f6793b..b2778d1fc6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/AvroTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -41,6 +36,11 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @since 5.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java index ae5fd5dc4c..777c70f6c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.UUID; import org.junit.Test; @@ -27,6 +25,8 @@ import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/CodecTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/CodecTransformerTests.java index d91fe5e357..9e227a0485 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/CodecTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/CodecTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -31,6 +29,8 @@ import org.springframework.integration.codec.Codec; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.2 @@ -78,7 +78,7 @@ public class CodecTransformerTests { @Override public T decode(byte[] bytes, Class type) throws IOException { return (T) (type.equals(String.class) ? new String(bytes) : - type.equals(Integer.class) ? Integer.valueOf(42) : Integer.valueOf(43)); + type.equals(Integer.class) ? Integer.valueOf(42) : Integer.valueOf(43)); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java index dc2ea127f0..18d668371e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java @@ -16,13 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.Collections; import java.util.HashMap; @@ -53,6 +46,13 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java index 8a02fd754c..fe3a4f7175 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java index 0df554776b..5e2e60285a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java index 3e05b853a6..763c4892f1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.util.Date; import java.util.UUID; @@ -33,6 +29,10 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java index d3d2daa95f..b6968f0786 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -35,6 +33,8 @@ import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java index b9c05a39db..a5e7728830 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index f9b02093fe..58653438ae 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.lang.reflect.Method; import java.util.Properties; @@ -34,6 +30,10 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan @@ -212,7 +212,7 @@ class MethodInvokingTransformerTests { assertThat(result).isNull(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test // this changed in 2.0 see INT-785 and INT-1130 void headerEnricherConfiguredWithMethodReference() throws Exception { @@ -233,7 +233,7 @@ class MethodInvokingTransformerTests { assertThat(result.getHeaders().get("prop3")).isEqualTo("baz"); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test // this changed in 2.0 see INT-785 and INT-1130 void headerEnricherConfiguredWithMethodName() { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java index 9321d22281..faf4978177 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.math.BigDecimal; import java.time.Instant; import java.util.ArrayList; @@ -28,6 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -40,8 +39,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.Jackson2JsonObjectMapper; import org.springframework.messaging.Message; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @@ -200,7 +199,7 @@ public class ObjectToMapTransformerTests { assertThat(transformedMap.get("listOfDates[1][1]")).isInstanceOf(String.class); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public Employee buildEmployee() { Address companyAddress = new Address(); companyAddress.setCity("Philadelphia"); @@ -208,8 +207,8 @@ public class ObjectToMapTransformerTests { companyAddress.setZip("12345"); Map coordinates = new HashMap<>(); - coordinates.put("latitude", new Long[]{ (long) 1, (long) 5, (long) 13 }); - coordinates.put("longitude", new Long[]{ (long) 156 }); + coordinates.put("latitude", new Long[] {(long) 1, (long) 5, (long) 13}); + coordinates.put("longitude", new Long[] {(long) 156}); companyAddress.setCoordinates(coordinates); List datesA = new ArrayList<>(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java index 4c56757ecb..a0ef2a7127 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.Charset; import org.junit.Test; @@ -25,6 +23,8 @@ import org.junit.Test; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Andrew Cowlin diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java index 1292dacfec..539d6b9676 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import java.io.Serializable; @@ -30,6 +26,10 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java index 0eb5513026..5e3154a2a7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import java.io.Serializable; @@ -28,6 +26,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java index 97d8eb1127..6392f13ca8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import org.junit.Test; @@ -26,6 +24,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformerTests.java index 46cdee3d9b..97116bf8c0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTypeConvertingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java index 1e882eedbf..1689e7c283 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +28,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author David Turanski diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java index b2692cc1c0..8bec55f83a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -44,6 +42,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan @@ -175,7 +175,7 @@ public class SpelTransformerIntegrationTests { @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { Assert.isInstanceOf(Foo.class, target); - return new TypedValue(((Foo) target).obtainBar(), TypeDescriptor.valueOf(String.class)); + return new TypedValue(((Foo) target).obtainBar(), TypeDescriptor.valueOf(String.class)); } @Override diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SysLogTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SysLogTransformerTests.java index cbf727c2ba..4a54708b53 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SysLogTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SysLogTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.Map; import java.util.Map.Entry; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -47,10 +47,10 @@ public class SysLogTransformerTests { assertThat(transformed.get(SyslogToMapTransformer.TAG)).isEqualTo("TESTING"); assertThat(transformed.get(SyslogToMapTransformer.MESSAGE)).isEqualTo("[70729]: TEST SYSLOG MESSAGE"); - String[] fields = { SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, + String[] fields = {SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, SyslogToMapTransformer.TIMESTAMP, SyslogToMapTransformer.HOST, - SyslogToMapTransformer.TAG, SyslogToMapTransformer.MESSAGE }; - Object[] values = { 19, 6, date, "WEBERN", "TESTING", "[70729]: TEST SYSLOG MESSAGE" }; + SyslogToMapTransformer.TAG, SyslogToMapTransformer.MESSAGE}; + Object[] values = {19, 6, date, "WEBERN", "TESTING", "[70729]: TEST SYSLOG MESSAGE"}; assertIterationOrder(fields, values, transformed); } @@ -83,10 +83,10 @@ public class SysLogTransformerTests { assertThat(transformed.containsKey(SyslogToMapTransformer.TAG)).isFalse(); assertThat(transformed.get(SyslogToMapTransformer.MESSAGE)).isEqualTo("[70729]: TEST SYSLOG MESSAGE"); - String[] fields = { SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, + String[] fields = {SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, SyslogToMapTransformer.TIMESTAMP, SyslogToMapTransformer.HOST, - SyslogToMapTransformer.MESSAGE }; - Object[] values = { 19, 6, date, "WEBERN", "[70729]: TEST SYSLOG MESSAGE" }; + SyslogToMapTransformer.MESSAGE}; + Object[] values = {19, 6, date, "WEBERN", "[70729]: TEST SYSLOG MESSAGE"}; assertIterationOrder(fields, values, transformed); } @@ -103,10 +103,10 @@ public class SysLogTransformerTests { assertThat(transformed.get(SyslogToMapTransformer.TAG)).isEqualTo("ABCDE1234567890ABCDE1234567890UV"); assertThat(transformed.get(SyslogToMapTransformer.MESSAGE)).isEqualTo("XYZ TEST SYSLOG MESSAGE"); - String[] fields = { SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, + String[] fields = {SyslogToMapTransformer.FACILITY, SyslogToMapTransformer.SEVERITY, SyslogToMapTransformer.TIMESTAMP, SyslogToMapTransformer.HOST, - SyslogToMapTransformer.TAG, SyslogToMapTransformer.MESSAGE }; - Object[] values = { 19, 6, date, "WEBERN", "ABCDE1234567890ABCDE1234567890UV", "XYZ TEST SYSLOG MESSAGE" }; + SyslogToMapTransformer.TAG, SyslogToMapTransformer.MESSAGE}; + Object[] values = {19, 6, date, "WEBERN", "ABCDE1234567890ABCDE1234567890UV", "XYZ TEST SYSLOG MESSAGE"}; assertIterationOrder(fields, values, transformed); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java index 2ce303a5cb..6201bd24ff 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -31,6 +29,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * Also in JMX - changes here should be reflected there. * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index e0f5815aee..69c2995339 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -58,6 +51,13 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/CallerBlocksPolicyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/CallerBlocksPolicyTests.java index 1a74432b3a..263a6104ea 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/CallerBlocksPolicyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/CallerBlocksPolicyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.util; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; @@ -28,6 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.core.task.TaskRejectedException; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java index 332fdbc368..8453dce391 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -32,6 +27,11 @@ import org.junit.jupiter.api.Test; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + /** * @author Gary Russell * @author Sergey Bogatyrev diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/UUIDConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/UUIDConverterTests.java index 24a765360d..72b9dbf1c1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/UUIDConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/UUIDConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Date; import java.util.UUID; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java index 4a249c850c..6b38be6864 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -150,7 +150,6 @@ public class ApplicationEventListeningMessageProducer extends ExpressionMessageP } - if (eventType.getRawClass() != null && PayloadApplicationEvent.class.isAssignableFrom(eventType.getRawClass())) { if (eventType.hasUnresolvableGenerics()) { diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java index 4f1a9af0b1..d56cbf325b 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.event.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.Properties; import java.util.Set; @@ -43,6 +41,8 @@ import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java index fa246a8456..629193b6d7 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.event.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,6 +43,8 @@ import org.springframework.test.context.event.ApplicationEvents; import org.springframework.test.context.event.RecordApplicationEvents; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/dsl/IntegrationFlowEventsTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/dsl/IntegrationFlowEventsTests.java index 8670756242..e183b8f635 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/dsl/IntegrationFlowEventsTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/dsl/IntegrationFlowEventsTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.event.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -48,6 +46,8 @@ import org.springframework.test.context.event.ApplicationEvents; import org.springframework.test.context.event.RecordApplicationEvents; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java index b7e01be3e1..a3090f7206 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.event.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -49,6 +46,9 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java index 00cad0a939..6cddf221e6 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.event.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationEvent; @@ -26,6 +24,8 @@ import org.springframework.integration.event.core.MessagingEvent; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/dsl/FeedEntryMessageSourceSpec.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/dsl/FeedEntryMessageSourceSpec.java index 6fd6a5df65..2b5420b427 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/dsl/FeedEntryMessageSourceSpec.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/dsl/FeedEntryMessageSourceSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ package org.springframework.integration.feed.dsl; import java.net.URL; +import com.rometools.rome.io.SyndFeedInput; + import org.springframework.core.io.Resource; import org.springframework.integration.dsl.MessageSourceSpec; import org.springframework.integration.feed.inbound.FeedEntryMessageSource; import org.springframework.integration.metadata.MetadataStore; -import com.rometools.rome.io.SyndFeedInput; - /** * A {@link MessageSourceSpec} for a {@link FeedEntryMessageSource}. * diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java index ef7b102bba..00d24a2149 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java @@ -24,6 +24,11 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +import com.rometools.rome.feed.synd.SyndEntry; +import com.rometools.rome.feed.synd.SyndFeed; +import com.rometools.rome.io.SyndFeedInput; +import com.rometools.rome.io.XmlReader; + import org.springframework.beans.factory.BeanFactory; import org.springframework.core.io.Resource; import org.springframework.integration.context.IntegrationContextUtils; @@ -35,11 +40,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.rometools.rome.feed.synd.SyndEntry; -import com.rometools.rome.feed.synd.SyndFeed; -import com.rometools.rome.io.SyndFeedInput; -import com.rometools.rome.io.XmlReader; - /** * This implementation of {@link org.springframework.integration.core.MessageSource} will * produce individual {@link SyndEntry}s for a feed identified with the 'feedUrl' diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java index ef1bbb1cef..b1a30c5dba 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java @@ -16,16 +16,13 @@ package org.springframework.integration.feed.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.io.File; import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import com.rometools.rome.feed.synd.SyndEntry; +import com.rometools.rome.io.SyndFeedInput; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -43,8 +40,10 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; -import com.rometools.rome.feed.synd.SyndEntry; -import com.rometools.rome.io.SyndFeedInput; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; /** * @author Oleg Zhurakousky diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/dsl/FeedDslTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/dsl/FeedDslTests.java index 0884e7a5af..adcdb4f098 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/dsl/FeedDslTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/dsl/FeedDslTests.java @@ -16,12 +16,11 @@ package org.springframework.integration.feed.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileReader; import java.util.Properties; +import com.rometools.rome.feed.synd.SyndEntry; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -39,7 +38,7 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.rometools.rome.feed.synd.SyndEntry; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java index 0a0b370ab5..1727f1ae0e 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java @@ -16,15 +16,12 @@ package org.springframework.integration.feed.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import com.rometools.rome.feed.synd.SyndEntry; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -34,7 +31,9 @@ import org.springframework.core.io.UrlResource; import org.springframework.integration.metadata.PropertiesPersistingMetadataStore; import org.springframework.messaging.Message; -import com.rometools.rome.feed.synd.SyndEntry; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; /** * @author Oleg Zhurakousky diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java index 0764782e9d..5cb7df4abb 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -120,7 +120,7 @@ public class FileReadingMessageSource extends AbstractMessageSource implem private boolean useWatchService; - private WatchEventType[] watchEvents = { WatchEventType.CREATE }; + private WatchEventType[] watchEvents = {WatchEventType.CREATE}; /** * Create a FileReadingMessageSource with a naturally ordered queue of unbounded capacity. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java index 87eb8ad2ca..a8b7bad8e4 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java @@ -362,7 +362,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand * the payload is a {@link File}, the payload's {@code lastModified} time will be * transferred to the destination file. For other payloads, the * {@link FileHeaders#SET_MODIFIED} header {@value FileHeaders#SET_MODIFIED} - * will be used if present and it's a {@link Number}. + * will be used if present, and it's a {@link Number}. * @param preserveTimestamp the preserveTimestamp to set. * @since 4.3 */ @@ -396,7 +396,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand this.logger.error("'chmod' setting ignored - the file system does not support Posix attributes"); return; } - BitSet bits = BitSet.valueOf(new byte[] { (byte) chmod, (byte) (chmod >> 8) }); // NOSONAR + BitSet bits = BitSet.valueOf(new byte[] {(byte) chmod, (byte) (chmod >> 8)}); // NOSONAR this.permissions = bits.stream() .boxed() .map((b) -> POSIX_FILE_PERMISSIONS[b]) @@ -450,7 +450,8 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand public void start() { if (this.flushTask == null && FileExistsMode.APPEND_NO_FLUSH.equals(this.fileExistsMode)) { TaskScheduler taskScheduler = getTaskScheduler(); - Assert.state(taskScheduler != null, "'taskScheduler' is required for FileExistsMode.APPEND_NO_FLUSH"); + Assert.state(taskScheduler != null, + "'taskScheduler' is required for FileExistsMode.APPEND_NO_FLUSH"); this.flushTask = taskScheduler .scheduleAtFixedRate(new Flusher(), Duration.ofMillis(this.flushInterval / 3)); // NOSONAR } @@ -600,7 +601,7 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand } /** - * Retrieves the File instance from the {@link FileHeaders#ORIGINAL_FILE} + * Retrieve the File instance from the {@link FileHeaders#ORIGINAL_FILE} * header if available. If the value is not a File instance or a String * representation of a file path, this will return {@code null}. */ @@ -657,9 +658,8 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand } else { - try (InputStream inputStream = sourceFileInputStream; - OutputStream outputStream = - new BufferedOutputStream(new FileOutputStream(tempFile), this.bufferSize)) { + try (InputStream inputStream = sourceFileInputStream; OutputStream outputStream = + new BufferedOutputStream(new FileOutputStream(tempFile), this.bufferSize)) { byte[] buffer = new byte[StreamUtils.BUFFER_SIZE]; int bytesRead; @@ -815,24 +815,10 @@ public class FileWritingMessageHandler extends AbstractReplyProducingMessageHand } private File determineFileToWrite(File resultFile, File tempFile) { - - final File fileToWriteTo; - - switch (this.fileExistsMode) { - case APPEND: - case APPEND_NO_FLUSH: - fileToWriteTo = resultFile; - break; - case FAIL: - case IGNORE: - case REPLACE: - case REPLACE_IF_MODIFIED: - fileToWriteTo = tempFile; - break; - default: - throw new IllegalStateException("Unsupported FileExistsMode: " + this.fileExistsMode); - } - return fileToWriteTo; + return switch (this.fileExistsMode) { + case APPEND, APPEND_NO_FLUSH -> resultFile; + case FAIL, IGNORE, REPLACE, REPLACE_IF_MODIFIED -> tempFile; + }; } private void cleanUpAfterCopy(File fileToWriteTo, File resultFile, File originalFile) throws IOException { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileParserUtils.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileParserUtils.java index a0c259ffb6..285cb41de8 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileParserUtils.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileParserUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ public final class FileParserUtils { } if (count != 1) { parserContext.getReaderContext().error("at most one of 'filename-pattern', " + - "'filename-regex', 'filter' or 'filter-expression' is allowed on remote file inbound adapter", + "'filename-regex', 'filter' or 'filter-expression' is allowed on remote file inbound adapter", element); } if (hasFilter) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java index efcf357def..576e0bf89a 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileWritingMessageHandlerBeanDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,7 +92,7 @@ abstract class FileWritingMessageHandlerBeanDefinitionBuilder { if (hasRemoteFileNameGenerator && hasRemoteFileNameGeneratorExpression) { parserContext.getReaderContext() .error("at most one of 'filename-generator-expression' or 'filename-generator' " + - "is allowed on file outbound adapter/gateway", element); + "is allowed on file outbound adapter/gateway", element); } if (hasRemoteFileNameGenerator) { builder.addPropertyReference("fileNameGenerator", remoteFileNameGenerator); diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/TailAdapterSpec.java b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/TailAdapterSpec.java index 12f8d5a036..1ee53e1c72 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/TailAdapterSpec.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/dsl/TailAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ public class TailAdapterSpec extends MessageProducerSpec { /** * Callback for using the same session for multiple * RemoteFileTemplate operations. - * @param the type the operations accepts. * @param the type the callback returns. * diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index 948bfd5555..df5e68a2dc 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -781,14 +781,14 @@ public abstract class AbstractRemoteFileOutboundGateway extends AbstractReply String remoteDir, String remoteFilePath, String remoteFileNewPath) { return this.remoteFileTemplate.execute(session -> { - Boolean result = mv(requestMessage, session, remoteFilePath, remoteFileNewPath); - return getMessageBuilderFactory() - .withPayload(result) - .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) - .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) - .setHeader(FileHeaders.RENAME_TO, remoteFileNewPath) - .setHeader(FileHeaders.REMOTE_HOST_PORT, session.getHostPort()); - }); + Boolean result = mv(requestMessage, session, remoteFilePath, remoteFileNewPath); + return getMessageBuilderFactory() + .withPayload(result) + .setHeader(FileHeaders.REMOTE_DIRECTORY, remoteDir) + .setHeader(FileHeaders.REMOTE_FILE, remoteFilename) + .setHeader(FileHeaders.RENAME_TO, remoteFileNewPath) + .setHeader(FileHeaders.REMOTE_HOST_PORT, session.getHostPort()); + }); } /** diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/AutoCreateDirectoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/AutoCreateDirectoryTests.java index b08d64fe2e..caac6359ad 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/AutoCreateDirectoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/AutoCreateDirectoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; - import java.io.File; import org.junit.After; @@ -28,6 +24,10 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java index 2fe62a6bec..8b48c78fd3 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.File; import org.junit.jupiter.api.Test; @@ -27,6 +24,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java index ed35f80cdf..44cea26b69 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; @@ -46,6 +42,10 @@ import org.springframework.transaction.TransactionException; import org.springframework.transaction.support.AbstractPlatformTransactionManager; import org.springframework.transaction.support.DefaultTransactionStatus; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java index 144073ef40..413703e017 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import java.util.Properties; @@ -33,6 +31,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java index 41f754d41e..643848a00d 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.File; import java.io.FileOutputStream; import java.nio.charset.StandardCharsets; @@ -37,6 +34,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java index 1a5ebec5ee..361c747793 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; import java.util.List; @@ -40,6 +38,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Alex Peters * @author Mark Fisher diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java index 1a5cc578ff..dfc695553d 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.concurrent.CountDownLatch; @@ -35,6 +33,8 @@ import org.springframework.test.annotation.Repeat; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourcePersistentFilterIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourcePersistentFilterIntegrationTests.java index 5c57c3ae8b..f5c11601ff 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourcePersistentFilterIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourcePersistentFilterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.After; @@ -31,6 +29,8 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java index dae2e47c83..fbb0dcf7dd 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import java.util.Comparator; @@ -36,6 +28,14 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Mark Fisher @@ -77,13 +77,13 @@ public class FileReadingMessageSourceTests { @Test public void straightProcess() { - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock}); assertThat(source.receive().getPayload()).isEqualTo(fileMock); } @Test public void requeueOnFailure() { - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock}); Message received = source.receive(); assertThat(received).isNotNull(); source.onFailure(received); @@ -95,7 +95,7 @@ public class FileReadingMessageSourceTests { public void scanEachPoll() { File anotherFileMock = mock(File.class); when(anotherFileMock.getAbsolutePath()).thenReturn("foo/bar/anotherFileMock"); - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock, anotherFileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock, anotherFileMock}); source.setScanEachPoll(true); assertThat(source.receive()).isNotNull(); assertThat(source.receive()).isNotNull(); @@ -105,7 +105,7 @@ public class FileReadingMessageSourceTests { @Test public void noDuplication() { - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock}); Message received = source.receive(); assertThat(received).isNotNull(); assertThat(received.getPayload()).isEqualTo(fileMock); @@ -121,7 +121,7 @@ public class FileReadingMessageSourceTests { @Test public void lockIsAcquired() { - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock}); Message received = source.receive(); assertThat(received).isNotNull(); assertThat(received.getPayload()).isEqualTo(fileMock); @@ -130,7 +130,7 @@ public class FileReadingMessageSourceTests { @Test public void lockedFilesAreIgnored() { - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { fileMock }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {fileMock}); when(locker.lock(fileMock)).thenReturn(false); Message received = source.receive(); assertThat(received).isNull(); @@ -151,7 +151,7 @@ public class FileReadingMessageSourceTests { when(comparator.compare(file1, file3)).thenReturn(1); when(comparator.compare(file3, file2)).thenReturn(-1); - when(inputDirectoryMock.listFiles()).thenReturn(new File[] { file2, file3, file1 }); + when(inputDirectoryMock.listFiles()).thenReturn(new File[] {file2, file3, file1}); assertThat(source.receive().getPayload()).isSameAs(file3); assertThat(source.receive().getPayload()).isSameAs(file2); assertThat(source.receive().getPayload()).isSameAs(file1); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java index cec0412487..788756c864 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.Test; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java index 26c7021506..3e7d376225 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.startsWith; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.File; @@ -69,6 +55,20 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.startsWith; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Iwein Fuld @@ -341,7 +341,7 @@ public class FileWritingMessageHandlerTests { handler.setDeleteSourceFiles(true); handler.setOutputChannel(output); Message message = MessageBuilder.withPayload( - SAMPLE_CONTENT.getBytes(DEFAULT_ENCODING)) + SAMPLE_CONTENT.getBytes(DEFAULT_ENCODING)) .setHeader(FileHeaders.ORIGINAL_FILE, sourceFile) .build(); assertThat(sourceFile.exists()).isTrue(); @@ -358,7 +358,7 @@ public class FileWritingMessageHandlerTests { handler.setDeleteSourceFiles(true); handler.setOutputChannel(output); Message message = MessageBuilder.withPayload( - SAMPLE_CONTENT.getBytes(DEFAULT_ENCODING)) + SAMPLE_CONTENT.getBytes(DEFAULT_ENCODING)) .setHeader(FileHeaders.ORIGINAL_FILE, sourceFile.getAbsolutePath()) .build(); assertThat(sourceFile.exists()).isTrue(); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/PatternMatchingFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/PatternMatchingFileListFilterTests.java index a2f2242df5..37c1bd5261 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/PatternMatchingFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/PatternMatchingFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; import java.util.regex.Pattern; @@ -29,6 +27,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.filters.RegexPatternFileListFilter; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell @@ -37,7 +37,7 @@ public class PatternMatchingFileListFilterTests { @Test public void matchSingleFile() { - File[] files = new File[] { new File("/some/path/test.txt") }; + File[] files = new File[] {new File("/some/path/test.txt")}; Pattern pattern = Pattern.compile("[a-z]+\\.txt"); RegexPatternFileListFilter filter = new RegexPatternFileListFilter(pattern); List accepted = filter.filterFiles(files); @@ -46,7 +46,7 @@ public class PatternMatchingFileListFilterTests { @Test public void noMatchWithSingleFile() { - File[] files = new File[] { new File("/some/path/Test.txt") }; + File[] files = new File[] {new File("/some/path/Test.txt")}; Pattern pattern = Pattern.compile("[a-z]+\\.txt"); RegexPatternFileListFilter filter = new RegexPatternFileListFilter(pattern); List accepted = filter.filterFiles(files); @@ -59,7 +59,7 @@ public class PatternMatchingFileListFilterTests { new File("/some/path/foo.txt"), new File("/some/path/foo.not"), new File("/some/path/bar.txt"), - new File("/some/path/bar.not") }; + new File("/some/path/bar.not")}; Pattern pattern = Pattern.compile("[a-z]+\\.txt"); RegexPatternFileListFilter filter = new RegexPatternFileListFilter(pattern); List accepted = filter.filterFiles(files); @@ -74,7 +74,7 @@ public class PatternMatchingFileListFilterTests { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "patternMatchingFileListFilterTests.xml", this.getClass()); FileListFilter filter = (FileListFilter) context.getBean("filter"); - File[] files = new File[] { new File("/some/path/foo.txt") }; + File[] files = new File[] {new File("/some/path/foo.txt")}; List accepted = filter.filterFiles(files); assertThat(accepted.size()).isEqualTo(1); context.close(); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/RecursiveDirectoryScannerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/RecursiveDirectoryScannerTests.java index be71a74fc6..d73e89c31b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/RecursiveDirectoryScannerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/RecursiveDirectoryScannerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +27,8 @@ import org.junit.rules.TemporaryFolder; import org.springframework.integration.file.filters.AcceptOnceFileListFilter; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java index f2e0ec85ba..2a5efce273 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -41,6 +38,9 @@ import org.springframework.integration.metadata.SimpleMetadataStore; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java index 1aad767f75..d422d26a6c 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/aggregator/FileAggregatorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.file.aggregator; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -53,6 +51,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @since 5.5 diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/AutoCreateDirectoryIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/AutoCreateDirectoryIntegrationTests.java index e78aa120c5..e1da999a9d 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/AutoCreateDirectoryIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/AutoCreateDirectoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.AfterClass; @@ -33,6 +31,8 @@ import org.springframework.integration.file.FileWritingMessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java index 5db20f65ef..a231b03ecd 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/ChainElementsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.util.Locale; import java.util.Properties; @@ -36,6 +33,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gunnar Hillert @@ -60,7 +60,7 @@ public class ChainElementsTests { @Test public void chainOutboundGateway() throws Exception { - try { + try { bootStrap("file-outbound-gateway"); fail("Expected a BeanDefinitionParsingException to be thrown."); } @@ -78,7 +78,7 @@ public class ChainElementsTests { @Test public void chainOutboundGatewayWithInputChannel() throws Exception { - try { + try { bootStrap("file-outbound-gateway-input-channel"); fail("Expected a XmlBeanDefinitionStoreException to be thrown."); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests.java index 9859136a1e..404a5e386b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java index 38d1036bce..a4cff9e400 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Comparator; import java.util.Iterator; @@ -41,6 +39,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java index a2be8c5748..85d218b109 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithClasspathInPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Iterator; import java.util.Set; @@ -38,6 +36,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPatternParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPatternParserTests.java index f2cfcd39f6..409dcbb4f5 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPatternParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPatternParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Set; @@ -38,6 +36,8 @@ import org.springframework.integration.file.filters.SimplePatternFileListFilter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPreventDuplicatesFlagTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPreventDuplicatesFlagTests.java index 5b29b24790..832e9d1b1b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPreventDuplicatesFlagTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithPreventDuplicatesFlagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Collection; import java.util.Iterator; @@ -38,6 +36,8 @@ import org.springframework.integration.file.filters.SimplePatternFileListFilter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert @@ -116,7 +116,7 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests { assertThat(filter instanceof AcceptOnceFileListFilter).isTrue(); File testFile = new File("test"); - File[] files = new File[] { testFile, testFile, testFile }; + File[] files = new File[] {testFile, testFile, testFile}; List result = filter.filterFiles(files); assertThat(result.size()).isEqualTo(1); } @@ -127,7 +127,7 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests { assertThat(filter instanceof CompositeFileListFilter).isFalse(); assertThat(filter instanceof AcceptOnceFileListFilter).isTrue(); File testFile = new File("test"); - File[] files = new File[] { testFile, testFile, testFile }; + File[] files = new File[] {testFile, testFile, testFile}; List result = filter.filterFiles(files); assertThat(result.size()).isEqualTo(1); } @@ -139,7 +139,7 @@ public class FileInboundChannelAdapterWithPreventDuplicatesFlagTests { assertThat(filter instanceof CompositeFileListFilter).isFalse(); assertThat(filter instanceof AcceptOnceFileListFilter).isFalse(); File testFile = new File("test"); - File[] files = new File[] { testFile, testFile, testFile }; + File[] files = new File[] {testFile, testFile, testFile}; List result = filter.filterFiles(files); assertThat(result.size()).isEqualTo(3); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithQueueSizeTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithQueueSizeTests.java index ea8ded94a3..1649bd7e1e 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithQueueSizeTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithQueueSizeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; @@ -35,6 +33,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithRegexPatternParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithRegexPatternParserTests.java index 465e3f215e..2f77d46099 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithRegexPatternParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileInboundChannelAdapterWithRegexPatternParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import java.util.regex.Pattern; @@ -33,6 +31,8 @@ import org.springframework.integration.file.filters.RegexPatternFileListFilter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileListFilterFactoryBeanTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileListFilterFactoryBeanTests.java index 4c3acc616b..93c5dd21cb 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileListFilterFactoryBeanTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileListFilterFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.Collection; import java.util.Iterator; @@ -32,6 +30,8 @@ import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.filters.SimplePatternFileListFilter; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java index a9c46402cd..d8160e2fab 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -32,6 +30,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Iwein Fuld diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundAdaptersWithClasspathInPropertiesTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundAdaptersWithClasspathInPropertiesTests.java index 9d37bd0b66..26496a4b79 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundAdaptersWithClasspathInPropertiesTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundAdaptersWithClasspathInPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java index 5586d48788..6bb764e010 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.File; import java.lang.reflect.Method; import java.nio.charset.Charset; @@ -50,6 +47,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Marius Bogoevici diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserWithErrorsTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserWithErrorsTests.java index 2d52882853..7e74987d0c 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserWithErrorsTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserWithErrorsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java index 48c3fe4f9b..22cf4240ba 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.File; import org.junit.Before; @@ -46,6 +43,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileSplitterParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileSplitterParserTests.java index 2bfa8a7c90..ddc8912919 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileSplitterParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileSplitterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.Charset; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java index dece6c13fa..c6a5450278 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.File; import org.junit.Test; @@ -37,6 +34,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java index dff36601fd..eb342beb6f 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests.java index 2a992b1689..00bd21b810 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/dsl/FileTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/dsl/FileTests.java index be35092676..895268505b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/dsl/FileTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/dsl/FileTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.file.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.File; import java.io.FileOutputStream; import java.io.FileReader; @@ -82,6 +79,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @@ -298,7 +298,7 @@ public class FileTests { assertThat(receive).isNotNull(); payloads.add((String) receive.getPayload()); - assertThat(payloads.toArray()).isEqualTo(new String[]{ "bar", "foo" }); + assertThat(payloads.toArray()).isEqualTo(new String[] {"bar", "foo"}); assertThat(TestUtils.getPropertyValue( this.beanFactory.getBean(newFolder1.getName() + ".adapter.source"), diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AbstractMarkerFilePresentFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AbstractMarkerFilePresentFileListFilterTests.java index 6fd57f0665..8f27c743e5 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AbstractMarkerFilePresentFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AbstractMarkerFilePresentFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +23,8 @@ import java.util.function.Function; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0 @@ -36,7 +36,7 @@ public class AbstractMarkerFilePresentFileListFilterTests { public void testDefault() { StringMarkerFilePresentFileListFilter filter = new StringMarkerFilePresentFileListFilter( new StringSimplePatternFilter("*.txt")); - List filtered = filter.filterFiles(new String[] { "foo.txt", "foo.txt.complete", "bar.txt" }); + List filtered = filter.filterFiles(new String[] {"foo.txt", "foo.txt.complete", "bar.txt"}); assertThat(filtered.size()).isEqualTo(1); assertThat(filtered.get(0)).isEqualTo("foo.txt"); } @@ -45,7 +45,7 @@ public class AbstractMarkerFilePresentFileListFilterTests { public void testSimple() { StringMarkerFilePresentFileListFilter filter = new StringMarkerFilePresentFileListFilter( new StringSimplePatternFilter("*.txt"), ".done"); - List filtered = filter.filterFiles(new String[] { "foo.txt", "foo.txt.done", "bar.txt", "baz.txt" }); + List filtered = filter.filterFiles(new String[] {"foo.txt", "foo.txt.done", "bar.txt", "baz.txt"}); assertThat(filtered.size()).isEqualTo(1); assertThat(filtered.get(0)).isEqualTo("foo.txt"); } @@ -54,9 +54,9 @@ public class AbstractMarkerFilePresentFileListFilterTests { public void testCustomFunction() { StringMarkerFilePresentFileListFilter filter = new StringMarkerFilePresentFileListFilter( new StringSimplePatternFilter("*.txt"), s -> "allFilesDone"); - List filtered = filter.filterFiles(new String[] { "foo.txt", "bar.txt" }); + List filtered = filter.filterFiles(new String[] {"foo.txt", "bar.txt"}); assertThat(filtered.size()).isEqualTo(0); - filtered = filter.filterFiles(new String[] { "foo.txt", "bar.txt", "allFilesDone" }); + filtered = filter.filterFiles(new String[] {"foo.txt", "bar.txt", "allFilesDone"}); assertThat(filtered.get(0)).isEqualTo("foo.txt"); assertThat(filtered.get(1)).isEqualTo("bar.txt"); } @@ -70,7 +70,7 @@ public class AbstractMarkerFilePresentFileListFilterTests { AbstractMarkerFilePresentFileListFilter.defaultFileNameFunction(".complete")); StringMarkerFilePresentFileListFilter filter = new StringMarkerFilePresentFileListFilter(map); List filtered = filter - .filterFiles(new String[] { "foo.txt", "foo.txt.done", "bar.xml", "bar.xml.complete", "baz.txt" }); + .filterFiles(new String[] {"foo.txt", "foo.txt.done", "bar.xml", "bar.xml.complete", "baz.txt"}); assertThat(filtered.size()).isEqualTo(2); assertThat(filtered.get(0)).isEqualTo("foo.txt"); assertThat(filtered.get(1)).isEqualTo("bar.xml"); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AcceptOnceFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AcceptOnceFileListFilterTests.java index 1b7e767028..937551edab 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AcceptOnceFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/AcceptOnceFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -29,6 +27,8 @@ import org.junit.Test; import org.springframework.integration.test.util.TestUtils; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -82,7 +82,7 @@ public class AcceptOnceFileListFilterTests { } protected void doTestRollback(ReversibleFileListFilter filter) { - String[] files = new String[] { "foo", "bar", "baz" }; + String[] files = new String[] {"foo", "bar", "baz"}; List passed = filter.filterFiles(files); assertThat(Arrays.equals(files, passed.toArray())).isTrue(); List now = filter.filterFiles(files); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/ChainFileListFilterIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/ChainFileListFilterIntegrationTests.java index 963a25fa57..a89110e4d3 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/ChainFileListFilterIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/ChainFileListFilterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -25,6 +23,8 @@ import java.util.List; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Aaron Grant * @author Cengis Kocaurlu @@ -37,7 +37,7 @@ public class ChainFileListFilterIntegrationTests { private File[] noFiles = new File[0]; - private File[] oneFile = new File[]{new MockOldFile("file.txt")}; + private File[] oneFile = new File[] {new MockOldFile("file.txt")}; @Test public void singleModifiedFilterNoFiles() throws IOException { diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/CompositeFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/CompositeFileListFilterTests.java index 60cf5bb104..0dcfde6ab0 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/CompositeFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/CompositeFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -32,6 +24,14 @@ import java.util.List; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Gary Russell @@ -56,7 +56,7 @@ public class CompositeFileListFilterTests { List returnedFiles = Collections.singletonList(fileMock); when(fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(returnedFiles); when(fileFilterMock2.filterFiles(isA(File[].class))).thenReturn(returnedFiles); - assertThat(compositeFileFilter.filterFiles(new File[]{ fileMock })).isEqualTo(returnedFiles); + assertThat(compositeFileFilter.filterFiles(new File[] {fileMock})).isEqualTo(returnedFiles); verify(fileFilterMock1).filterFiles(isA(File[].class)); verify(fileFilterMock2).filterFiles(isA(File[].class)); compositeFileFilter.close(); @@ -70,7 +70,7 @@ public class CompositeFileListFilterTests { List returnedFiles = Collections.singletonList(fileMock); when(fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(returnedFiles); when(fileFilterMock2.filterFiles(isA(File[].class))).thenReturn(returnedFiles); - assertThat(compositeFileFilter.filterFiles(new File[]{ fileMock })).isEqualTo(returnedFiles); + assertThat(compositeFileFilter.filterFiles(new File[] {fileMock})).isEqualTo(returnedFiles); verify(fileFilterMock1).filterFiles(isA(File[].class)); verify(fileFilterMock2).filterFiles(isA(File[].class)); compositeFileFilter.close(); @@ -84,7 +84,7 @@ public class CompositeFileListFilterTests { when(fileFilterMock2.filterFiles(isA(File[].class))).thenReturn(new ArrayList<>()); when(fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(new ArrayList<>()); - assertThat(compositeFileFilter.filterFiles(new File[]{ fileMock }).isEmpty()).isTrue(); + assertThat(compositeFileFilter.filterFiles(new File[] {fileMock}).isEmpty()).isTrue(); compositeFileFilter.close(); } @@ -95,7 +95,7 @@ public class CompositeFileListFilterTests { compositeFileFilter.addFilter(this.fileFilterMock2); List noFiles = new ArrayList<>(); when(this.fileFilterMock1.filterFiles(isA(File[].class))).thenReturn(noFiles); - assertThat(compositeFileFilter.filterFiles(new File[]{ this.fileMock })).isEqualTo(noFiles); + assertThat(compositeFileFilter.filterFiles(new File[] {this.fileMock})).isEqualTo(noFiles); verify(fileFilterMock1).filterFiles(isA(File[].class)); verify(fileFilterMock2, never()).filterFiles(isA(File[].class)); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/FileSystemMarkerFilePresentFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/FileSystemMarkerFilePresentFileListFilterTests.java index 6459c63a88..372378170b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/FileSystemMarkerFilePresentFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/FileSystemMarkerFilePresentFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; @@ -25,6 +23,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0 @@ -41,10 +41,10 @@ public class FileSystemMarkerFilePresentFileListFilterTests { new SimplePatternFileListFilter("*.txt")); File foo = this.folder.newFile("foo.txt"); foo.createNewFile(); - assertThat(filter.filterFiles(new File[] { foo }).size()).isEqualTo(0); + assertThat(filter.filterFiles(new File[] {foo}).size()).isEqualTo(0); File complete = this.folder.newFile("foo.txt.complete"); complete.createNewFile(); - List filtered = filter.filterFiles(new File[] { foo, complete }); + List filtered = filter.filterFiles(new File[] {foo, complete}); assertThat(filtered.size()).isEqualTo(1); assertThat(filtered.get(0).getName()).isEqualTo("foo.txt"); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/LastModifiedFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/LastModifiedFileListFilterTests.java index 0851c86345..49a7ec6ca0 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/LastModifiedFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/LastModifiedFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; import java.util.concurrent.TimeUnit; @@ -26,6 +24,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -45,11 +45,11 @@ public class LastModifiedFileListFilterTests { FileOutputStream fileOutputStream = new FileOutputStream(foo); fileOutputStream.write("x".getBytes()); fileOutputStream.close(); - assertThat(filter.filterFiles(new File[] { foo })).hasSize(0); + assertThat(filter.filterFiles(new File[] {foo})).hasSize(0); assertThat(filter.accept(foo)).isFalse(); // Make a file as of yesterday's foo.setLastModified(System.currentTimeMillis() - 1000 * 60 * 60 * 24); - assertThat(filter.filterFiles(new File[] { foo })).hasSize(1); + assertThat(filter.filterFiles(new File[] {foo})).hasSize(1); assertThat(filter.accept(foo)).isTrue(); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java index c5590bb9f8..02961189ea 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterExternalStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; import java.util.Map; @@ -43,6 +41,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -126,21 +126,21 @@ public class PersistentAcceptOnceFileListFilterExternalStoreTests implements Red final FileSystemPersistentAcceptOnceFileListFilter filter = new FileSystemPersistentAcceptOnceFileListFilter(store, "foo:"); final File file = File.createTempFile("foo", ".txt"); - assertThat(filter.filterFiles(new File[]{ file })).hasSize(1); + assertThat(filter.filterFiles(new File[] {file})).hasSize(1); String ts = store.get("foo:" + file.getAbsolutePath()); assertThat(ts).isEqualTo(String.valueOf(file.lastModified())); - assertThat(filter.filterFiles(new File[]{ file })).isEmpty(); + assertThat(filter.filterFiles(new File[] {file})).isEmpty(); assertThat(file.setLastModified(file.lastModified() + 5000L)).isTrue(); - assertThat(filter.filterFiles(new File[]{ file })).hasSize(1); + assertThat(filter.filterFiles(new File[] {file})).hasSize(1); ts = store.get("foo:" + file.getAbsolutePath()); assertThat(ts).isEqualTo(String.valueOf(file.lastModified())); - assertThat(filter.filterFiles(new File[]{ file })).isEmpty(); + assertThat(filter.filterFiles(new File[] {file})).isEmpty(); suspend.set(true); assertThat(file.setLastModified(file.lastModified() + 5000L)).isTrue(); Future result = Executors.newSingleThreadExecutor() - .submit(() -> filter.filterFiles(new File[]{ file }).size()); + .submit(() -> filter.filterFiles(new File[] {file}).size()); assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue(); store.put("foo:" + file.getAbsolutePath(), "43"); latch1.countDown(); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java index 1ca8692f6b..6cd121c82f 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/PersistentAcceptOnceFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.Closeable; import java.io.File; import java.io.Flushable; @@ -36,6 +34,8 @@ import org.junit.jupiter.api.Test; import org.springframework.integration.metadata.ConcurrentMetadataStore; import org.springframework.integration.metadata.SimpleMetadataStore; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -70,21 +70,21 @@ public class PersistentAcceptOnceFileListFilterTests extends AcceptOnceFileListF final FileSystemPersistentAcceptOnceFileListFilter filter = new FileSystemPersistentAcceptOnceFileListFilter(store, "foo:"); final File file = File.createTempFile("foo", ".txt"); - assertThat(filter.filterFiles(new File[]{ file }).size()).isEqualTo(1); + assertThat(filter.filterFiles(new File[] {file}).size()).isEqualTo(1); String ts = store.get("foo:" + file.getAbsolutePath()); assertThat(ts).isEqualTo(String.valueOf(file.lastModified())); - assertThat(filter.filterFiles(new File[]{ file }).size()).isEqualTo(0); + assertThat(filter.filterFiles(new File[] {file}).size()).isEqualTo(0); file.setLastModified(file.lastModified() + 5000L); - assertThat(filter.filterFiles(new File[]{ file }).size()).isEqualTo(1); + assertThat(filter.filterFiles(new File[] {file}).size()).isEqualTo(1); ts = store.get("foo:" + file.getAbsolutePath()); assertThat(ts).isEqualTo(String.valueOf(file.lastModified())); - assertThat(filter.filterFiles(new File[]{ file }).size()).isEqualTo(0); + assertThat(filter.filterFiles(new File[] {file}).size()).isEqualTo(0); suspend.set(true); file.setLastModified(file.lastModified() + 5000L); Future result = Executors.newSingleThreadExecutor() - .submit(() -> filter.filterFiles(new File[]{ file }).size()); + .submit(() -> filter.filterFiles(new File[] {file}).size()); assertThat(latch2.await(10, TimeUnit.SECONDS)).isTrue(); store.put("foo:" + file.getAbsolutePath(), "43"); latch1.countDown(); @@ -119,7 +119,7 @@ public class PersistentAcceptOnceFileListFilterTests extends AcceptOnceFileListF public void testRollbackFileSystem() throws Exception { FileSystemPersistentAcceptOnceFileListFilter filter = new FileSystemPersistentAcceptOnceFileListFilter( new SimpleMetadataStore(), "rollback:"); - File[] files = new File[]{ new File("foo"), new File("bar"), new File("baz") }; + File[] files = new File[] {new File("foo"), new File("bar"), new File("baz")}; List passed = filter.filterFiles(files); assertThat(passed.size()).isEqualTo(0); for (File file : files) { @@ -173,7 +173,7 @@ public class PersistentAcceptOnceFileListFilterTests extends AcceptOnceFileListF FileSystemPersistentAcceptOnceFileListFilter filter = new FileSystemPersistentAcceptOnceFileListFilter( store, prefix); final File file = File.createTempFile("foo", ".txt"); - File[] files = new File[]{ file }; + File[] files = new File[] {file}; List passed = filter.filterFiles(files); assertThat(Arrays.equals(files, passed.toArray())).isTrue(); filter.rollback(passed.get(0), passed); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java index 959ae0bb3b..6895989940 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.file.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileChannelCacheTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileChannelCacheTests.java index 90f9fb23de..bd8cdf16ef 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileChannelCacheTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileChannelCacheTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.locking; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; @@ -25,6 +23,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Emmanuel Roux * @since 4.3.22 diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java index 5bc8bfb2ac..cb8a124ebd 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.locking; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.Before; @@ -33,6 +31,8 @@ import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingWithMultipleSourcesIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingWithMultipleSourcesIntegrationTests.java index 3cbf8b92b9..aa634d1f5c 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingWithMultipleSourcesIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingWithMultipleSourcesIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.locking; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; @@ -33,6 +31,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java index 22d43e23af..e9f1bb9dc4 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.locking; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import java.lang.reflect.Field; @@ -31,6 +29,8 @@ import org.junit.rules.TemporaryFolder; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Iwein Fuld * @author Gary Russell diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileStreamingMessageSourceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileStreamingMessageSourceTests.java index 631a765f68..c9c46bf8ab 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileStreamingMessageSourceTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileStreamingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.file.remote; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; @@ -39,6 +32,13 @@ import org.springframework.integration.file.remote.session.CachingSessionFactory import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Lukas Gemela * @author Artem Bilan @@ -52,7 +52,7 @@ public class RemoteFileStreamingMessageSourceTests { @SuppressWarnings("unchecked") public void filterOutFilesNotAcceptedByFilter() throws IOException { RemoteFileTemplate remoteFileTemplate = mock(RemoteFileTemplate.class); - when(remoteFileTemplate.list("remoteDirectory")).thenReturn(new String[] { "file1", "file2" }); + when(remoteFileTemplate.list("remoteDirectory")).thenReturn(new String[] {"file1", "file2"}); Session session = mock(Session.class); when(session.readRaw(anyString())).thenReturn(mock(InputStream.class)); when(remoteFileTemplate.getSession()).thenReturn(session); @@ -79,7 +79,7 @@ public class RemoteFileStreamingMessageSourceTests { public void sessionReturnedToCacheProperlyOnDoReceive() throws IOException { Session session = mock(Session.class); when(session.readRaw(anyString())).thenThrow(IOException.class); - when(session.list("remoteDirectory")).thenReturn(new String[] { "file1" }); + when(session.list("remoteDirectory")).thenReturn(new String[] {"file1"}); SessionFactory sessionFactory = mock(SessionFactory.class); when(sessionFactory.getSession()).thenReturn(session); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileTemplateTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileTemplateTests.java index 775cfb916b..86a44fb5ce 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileTemplateTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileTemplateTests.java @@ -16,17 +16,6 @@ package org.springframework.integration.file.remote; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -49,6 +38,17 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java index 1650071029..43b4670405 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,6 @@ package org.springframework.integration.file.remote; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -57,6 +48,15 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.StreamTransformer; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan @@ -345,19 +345,19 @@ public class StreamingInboundTests { } try { Session session = mock(Session.class); - willReturn(new String[]{ "/foo/foo", "/foo/bar" }).given(session).list("/foo"); + willReturn(new String[] {"/foo/foo", "/foo/bar"}).given(session).list("/foo"); ByteArrayInputStream foo = new ByteArrayInputStream("foo\nbar".getBytes()); ByteArrayInputStream bar = new ByteArrayInputStream("baz\nqux".getBytes()); willReturn(foo).given(session).readRaw("/foo/foo"); willReturn(bar).given(session).readRaw("/foo/bar"); - willReturn(new String[]{ "/bar/foo", "/bar/bar" }).given(session).list("/bar"); + willReturn(new String[] {"/bar/foo", "/bar/bar"}).given(session).list("/bar"); ByteArrayInputStream foo2 = new ByteArrayInputStream("foo\r\nbar".getBytes()); ByteArrayInputStream bar2 = new ByteArrayInputStream("baz\r\nqux".getBytes()); willReturn(foo2).given(session).readRaw("/bar/foo"); willReturn(bar2).given(session).readRaw("/bar/bar"); - willReturn(new String[]{ "/bad/file1", "/bad/file2" }).given(session).list("/bad"); + willReturn(new String[] {"/bad/file1", "/bad/file2"}).given(session).list("/bad"); willThrow(new IOException("No file")).given(session).readRaw("/bad/file1"); willThrow(new IOException("No file")).given(session).readRaw("/bad/file2"); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java index faa739fcf0..f318643baf 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java @@ -16,19 +16,6 @@ package org.springframework.integration.file.remote.gateway; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -66,6 +53,19 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell @@ -167,10 +167,10 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry(path1.replaceFirst("testremote/", ""), 123, false, false, 1234, "-r--r--r--"), new TestLsEntry(path2.replaceFirst("testremote/", ""), 123, false, false, 1234, - "-r--r--r--") }; + "-r--r--r--")}; } }); @@ -201,7 +201,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ new TestLsEntry("f1", 123, false, false, 1234, "-r--r--r--") }; + return new TestLsEntry[] {new TestLsEntry("f1", 123, false, false, 1234, "-r--r--r--")}; } }); @@ -343,7 +343,7 @@ public class RemoteFileOutboundGatewayTests { } public TestLsEntry[] level1List() { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 123, false, false, 1234, "-r--r--r--"), new TestLsEntry("d1", 0, true, false, 12345, "drw-r--r--"), new TestLsEntry("f2", 12345, false, false, 123456, "-rw-r--r--") @@ -351,14 +351,14 @@ public class RemoteFileOutboundGatewayTests { } public TestLsEntry[] level2List() { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("d2", 0, true, false, 12345, "drw-r--r--"), new TestLsEntry("f3", 12345, false, false, 123456, "-rw-r--r--") }; } public TestLsEntry[] level3List() { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f4", 12345, false, false, 123456, "-rw-r--r--") }; } @@ -560,7 +560,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") }; } @@ -597,7 +597,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") }; } @@ -659,7 +659,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") }; } @@ -697,7 +697,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, modified.getTime(), "-rw-r--r--") }; } @@ -732,7 +732,7 @@ public class RemoteFileOutboundGatewayTests { @Override public TestLsEntry[] list(String path) { - return new TestLsEntry[]{ + return new TestLsEntry[] { new TestLsEntry("f1", 1234, false, false, 12345, "-rw-r--r--") }; } @@ -1052,7 +1052,8 @@ public class RemoteFileOutboundGatewayTests { static class TestRemoteFileOutboundGateway extends AbstractRemoteFileOutboundGateway { - @SuppressWarnings("unchecked") TestRemoteFileOutboundGateway(SessionFactory sessionFactory, + @SuppressWarnings("unchecked") + TestRemoteFileOutboundGateway(SessionFactory sessionFactory, String command, String expression) { super(sessionFactory, Command.toCommand(command), expression); this.setBeanFactory(mock(BeanFactory.class)); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java index 560589cfe5..c044b1d16c 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,6 @@ package org.springframework.integration.file.remote.handler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.io.InputStream; import java.util.Set; @@ -47,6 +37,16 @@ import org.springframework.integration.util.SimplePool; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -63,7 +63,7 @@ public class FileTransferringMessageHandlerTests { when(sf.getSession()).thenReturn(session); doAnswer(invocation -> { - String path = invocation.getArgument(1); + String path = invocation.getArgument(1); assertThat(path.startsWith("/")).isFalse(); return null; }).when(session).rename(Mockito.anyString(), Mockito.anyString()); @@ -109,7 +109,7 @@ public class FileTransferringMessageHandlerTests { when(sf.getSession()).thenReturn(session); doAnswer(invocation -> { - String path = invocation.getArgument(1); + String path = invocation.getArgument(1); assertThat(path.startsWith("/")).isFalse(); return null; }).when(session).rename(Mockito.anyString(), Mockito.anyString()); diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/CachingSessionFactoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/CachingSessionFactoryTests.java index 9f56356cd3..498e97d4be 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/CachingSessionFactoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/CachingSessionFactoryTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.file.remote.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.OutputStream; @@ -35,6 +29,12 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/DelegatingSessionFactoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/DelegatingSessionFactoryTests.java index 7f5ac544f3..97a00ffd6b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/DelegatingSessionFactoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/session/DelegatingSessionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.file.remote.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -45,6 +39,12 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/synchronizer/AbstractRemoteFileSynchronizerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/synchronizer/AbstractRemoteFileSynchronizerTests.java index 38f74407d3..21b0ff5e16 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/synchronizer/AbstractRemoteFileSynchronizerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/synchronizer/AbstractRemoteFileSynchronizerTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.file.remote.synchronizer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.mock; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -46,6 +41,11 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -358,7 +358,7 @@ public class AbstractRemoteFileSynchronizerTests { @Override public String[] list(String path) { - return new String[]{ "foo", "bar", "baz" }; + return new String[] {"foo", "bar", "baz"}; } @Override diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/splitter/FileSplitterTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/splitter/FileSplitterTests.java index 7d60f24fe3..938af24f9e 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/splitter/FileSplitterTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/splitter/FileSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2021 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.file.splitter; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; @@ -37,6 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -67,7 +65,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Artem Bilan @@ -383,7 +382,8 @@ public class FileSplitterTests { AtomicBoolean closeCalled = new AtomicBoolean(); FileReader fileReader = new FileReader(file) { - @Override public void close() throws IOException { + @Override + public void close() throws IOException { super.close(); closeCalled.set(true); } diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java index f3990036d4..739ee4faf2 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.file.tail; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -46,6 +42,10 @@ import org.springframework.integration.file.tail.FileTailingMessageProducerSuppo import org.springframework.messaging.Message; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Gavin Gray diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailRule.java b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailRule.java index 58f685fab6..7d486d1c8e 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailRule.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/TailRule.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.tail; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -37,6 +35,8 @@ import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runners.model.Statement; +import static org.assertj.core.api.Assertions.assertThat; + /** * Ignores tests annotated with {@link TailAvailable} if 'tail' with the requested options * does not work on this platform. diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java index 39072af9d0..f6e64bb9c1 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.file.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; @@ -30,6 +28,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Alex Peters * @author Artem Bilan diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java index 4e8f5c37ab..657de80a57 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.file.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Before; import org.junit.Test; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Alex Peters * @author Gunnar Hillert diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java index 3d6ac08440..ce0d5a573a 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.file.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Before; import org.junit.Test; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Alex Peters * @author Artem Bilan diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpInboundChannelAdapterSpec.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpInboundChannelAdapterSpec.java index 35d80ce92f..19fca2f466 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpInboundChannelAdapterSpec.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpInboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.integration.metadata.SimpleMetadataStore; */ public class FtpInboundChannelAdapterSpec extends RemoteFileInboundChannelAdapterSpec { + FtpInboundFileSynchronizingMessageSource> { protected FtpInboundChannelAdapterSpec(SessionFactory sessionFactory, Comparator comparator) { super(new FtpInboundFileSynchronizer(sessionFactory)); diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpStreamingInboundChannelAdapterSpec.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpStreamingInboundChannelAdapterSpec.java index 2309c4a2b9..5d77f39082 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpStreamingInboundChannelAdapterSpec.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/dsl/FtpStreamingInboundChannelAdapterSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.integration.metadata.SimpleMetadataStore; */ public class FtpStreamingInboundChannelAdapterSpec extends RemoteFileStreamingInboundChannelAdapterSpec { + FtpStreamingMessageSource> { protected FtpStreamingInboundChannelAdapterSpec(RemoteFileTemplate remoteFileTemplate, Comparator comparator) { diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpMessageHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpMessageHandler.java index 63ca2b01c7..8b0672e329 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpMessageHandler.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpMessageHandler.java @@ -74,7 +74,7 @@ public class FtpMessageHandler extends FileTransferringMessageHandler { client.sendSiteCommand(chModCommand); } catch (IOException e) { - throw new UncheckedIOException("Failed to execute '" + chModCommand + "'", e); + throw new UncheckedIOException("Failed to execute '" + chModCommand + "'", e); } }); } diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java index d0450c5b1e..003864230e 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,15 +144,15 @@ public class DefaultFtpsSessionFactory extends AbstractFtpSessionFactory f.toUpperCase() + ".a") - .localDirectory(getTargetLocalDirectory()), - e -> e.id("ftpInboundAdapter").poller(Pollers.fixedDelay(100))) + .preserveTimestamp(true) + .remoteDirectory("ftpSource") + .maxFetchSize(10) + .scanner(scanner) + .regexFilter(".*\\.txt$") + .localFilename(f -> f.toUpperCase() + ".a") + .localDirectory(getTargetLocalDirectory()), + e -> e.id("ftpInboundAdapter").poller(Pollers.fixedDelay(100))) .channel(out) .get(); IntegrationFlowRegistration registration = this.flowContext.registration(flow).register(); @@ -150,11 +150,11 @@ public class FtpTests extends FtpTestSupport { public void testFtpInboundStreamFlow() throws Exception { QueueChannel out = new QueueChannel(); StandardIntegrationFlow flow = IntegrationFlow.from( - Ftp.inboundStreamingAdapter(new FtpRemoteFileTemplate(sessionFactory())) - .remoteDirectory("ftpSource") - .maxFetchSize(11) - .regexFilter(".*\\.txt$"), - e -> e.id("ftpInboundAdapter").poller(Pollers.fixedDelay(100))) + Ftp.inboundStreamingAdapter(new FtpRemoteFileTemplate(sessionFactory())) + .remoteDirectory("ftpSource") + .maxFetchSize(11) + .regexFilter(".*\\.txt$"), + e -> e.id("ftpInboundAdapter").poller(Pollers.fixedDelay(100))) .channel(out) .get(); IntegrationFlowRegistration registration = this.flowContext.registration(flow).register(); diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpFileListFilterTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpFileListFilterTests.java index edd14aca02..20536af5a6 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpFileListFilterTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ftp.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; @@ -33,6 +31,8 @@ import org.springframework.integration.ftp.session.FtpRemoteFileTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0 @@ -78,5 +78,4 @@ public class FtpFileListFilterTests extends FtpTestSupport { } - } diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpPersistentAcceptOnceFileListFilterTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpPersistentAcceptOnceFileListFilterTests.java index 423488e930..b73ddc5b63 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpPersistentAcceptOnceFileListFilterTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/filters/FtpPersistentAcceptOnceFileListFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ftp.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Calendar; import java.util.List; @@ -27,6 +25,8 @@ import org.junit.jupiter.api.Test; import org.springframework.integration.metadata.SimpleMetadataStore; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 4.0.4 diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java index cf953c07d9..ebc60f8525 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.ftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.OutputStream; import java.net.InetAddress; @@ -59,6 +52,13 @@ import org.springframework.integration.metadata.SimpleMetadataStore; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpMessageSourceTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpMessageSourceTests.java index c6f2f0423b..723a229906 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpMessageSourceTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0.7 diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSourceTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSourceTests.java index b50b9da40d..b6d8c450db 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSourceTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpStreamingMessageSourceTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.ftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.Closeable; import java.io.InputStream; import java.time.Duration; @@ -57,6 +55,8 @@ import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java index 6b9650d1cd..b5241667fb 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/RotatingServersTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.ftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.File; import java.util.ArrayList; @@ -61,6 +59,8 @@ import org.springframework.integration.ftp.session.FtpRemoteFileTemplate; import org.springframework.integration.metadata.SimpleMetadataStore; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -324,10 +324,10 @@ public class RotatingServersTests extends FtpTestSupport { @Bean public IntegrationFlow flow() { return IntegrationFlow.from(Ftp.inboundAdapter(sf()) - .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) - .localDirectory(localDir()) - .remoteDirectory("."), - e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) + .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) + .localDirectory(localDir()) + .remoteDirectory("."), + e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) .channel(MessageChannels.queue("files")) .get(); } @@ -360,11 +360,11 @@ public class RotatingServersTests extends FtpTestSupport { @Bean public IntegrationFlow flow() { return IntegrationFlow.from(Ftp.inboundAdapter(sf()) - .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) - .localDirectory(new File(TMP_DIR, "variable")) - .localFilenameExpression("#remoteDirectory + T(java.io.File).separator + #root") - .remoteDirectory("."), - e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) + .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) + .localDirectory(new File(TMP_DIR, "variable")) + .localFilenameExpression("#remoteDirectory + T(java.io.File).separator + #root") + .remoteDirectory("."), + e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) .channel(MessageChannels.queue("files")) .get(); } @@ -378,9 +378,9 @@ public class RotatingServersTests extends FtpTestSupport { @Bean public IntegrationFlow flow() { return IntegrationFlow.from(Ftp.inboundStreamingAdapter(new FtpRemoteFileTemplate(sf())) - .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) - .remoteDirectory("."), - e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) + .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) + .remoteDirectory("."), + e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) .channel(MessageChannels.queue("files")) .get(); } @@ -404,10 +404,10 @@ public class RotatingServersTests extends FtpTestSupport { @Bean public IntegrationFlow flow() { return IntegrationFlow.from(Ftp.inboundStreamingAdapter(new FtpRemoteFileTemplate(sf())) - .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) - .remoteDirectory(".") - .maxFetchSize(1), - e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) + .filter(new FtpPersistentAcceptOnceFileListFilter(new SimpleMetadataStore(), "rotate")) + .remoteDirectory(".") + .maxFetchSize(1), + e -> e.poller(Pollers.fixedDelay(1).advice(advice()))) .channel(MessageChannels.queue("files")) .get(); } diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/BigMGetTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/BigMGetTests.java index 6be1fea02c..befe7bbe97 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/BigMGetTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/BigMGetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.ftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java index 5e996e0dcb..8578f8545f 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.ftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; @@ -60,6 +53,13 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java index f51100e627..f0a144defc 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java @@ -16,15 +16,6 @@ package org.springframework.integration.ftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -92,6 +83,15 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplateTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplateTests.java index 40e357b13d..e1b482ee80 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplateTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/FtpRemoteFileTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.ftp.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -50,6 +44,12 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java index 057fdd25c3..56ede75e5c 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,6 @@ package org.springframework.integration.ftp.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.lang.reflect.Field; import java.util.Random; import java.util.concurrent.ExecutorService; @@ -45,6 +35,16 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.util.PoolItemNotAvailableException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java b/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java index 3c6e4a31f0..2de1896d46 100644 --- a/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java +++ b/spring-integration-graphql/src/test/java/org/springframework/integration/graphql/outbound/GraphQlMessageHandlerTests.java @@ -16,14 +16,16 @@ package org.springframework.integration.graphql.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Locale; import java.util.Map; import java.util.UUID; +import graphql.execution.reactive.SubscriptionPublisher; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -57,10 +59,7 @@ import org.springframework.stereotype.Repository; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import graphql.execution.reactive.SubscriptionPublisher; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/BindingOverwriteGroovyObjectCustomizerDecorator.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/BindingOverwriteGroovyObjectCustomizerDecorator.java index 17324b42ed..0747fa4189 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/BindingOverwriteGroovyObjectCustomizerDecorator.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/BindingOverwriteGroovyObjectCustomizerDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.groovy; -import org.springframework.util.Assert; - import groovy.lang.Binding; import groovy.lang.GroovyObject; import groovy.lang.Script; +import org.springframework.util.Assert; + /** * @author Artem Bilan * @since 2.2 diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java index b894d36f75..0550b6fc1d 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,9 @@ import java.io.UncheckedIOException; import java.util.Map; import java.util.UUID; +import groovy.lang.Binding; +import groovy.lang.GString; + import org.springframework.integration.IntegrationPattern; import org.springframework.integration.IntegrationPatternType; import org.springframework.integration.scripting.AbstractScriptExecutingMessageProcessor; @@ -35,9 +38,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import groovy.lang.Binding; -import groovy.lang.GString; - /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java index 4164e21031..de6ed2bbb6 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java @@ -22,6 +22,14 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import groovy.lang.Binding; +import groovy.lang.GString; +import groovy.lang.GroovyClassLoader; +import groovy.lang.GroovyObject; +import groovy.lang.MetaClass; +import groovy.lang.MissingPropertyException; +import groovy.lang.Script; +import groovy.transform.CompileStatic; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer; @@ -40,15 +48,6 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import groovy.lang.Binding; -import groovy.lang.GString; -import groovy.lang.GroovyClassLoader; -import groovy.lang.GroovyObject; -import groovy.lang.MetaClass; -import groovy.lang.MissingPropertyException; -import groovy.lang.Script; -import groovy.transform.CompileStatic; - /** * The {@link org.springframework.integration.handler.MessageProcessor} implementation * to evaluate Groovy scripts. diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java index 4dfc75f919..d23c01bbfa 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,13 +18,13 @@ package org.springframework.integration.groovy; import java.util.Map; -import org.springframework.scripting.groovy.GroovyObjectCustomizer; -import org.springframework.util.Assert; - import groovy.lang.Binding; import groovy.lang.GroovyObject; import groovy.lang.Script; +import org.springframework.scripting.groovy.GroovyObjectCustomizer; +import org.springframework.util.Assert; + /** * @author Dave Syer * @author Oleg Zhurakousky diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java index 49c41ce5d1..6b40405b3d 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,9 @@ package org.springframework.integration.groovy.config; import java.util.HashMap; import java.util.Map; +import groovy.lang.Binding; +import groovy.lang.MissingPropertyException; + import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanCreationNotAllowedException; import org.springframework.beans.factory.BeanFactory; @@ -35,9 +38,6 @@ import org.springframework.messaging.MessageHandler; import org.springframework.scripting.groovy.GroovyObjectCustomizer; import org.springframework.util.CustomizableThreadCreator; -import groovy.lang.Binding; -import groovy.lang.MissingPropertyException; - /** * FactoryBean for creating {@link MessageHandler} instances to handle a message as a Groovy Script. * @@ -79,7 +79,7 @@ public class GroovyControlBusFactoryBean extends AbstractSimpleMessageHandlerFac Map variables = new HashMap<>(); variables.put("headers", message.getHeaders()); return variables; - }); + }); if (this.customizer != null) { processor.setCustomizer(this.customizer); } @@ -144,8 +144,8 @@ public class GroovyControlBusFactoryBean extends AbstractSimpleMessageHandlerFac } throw new BeanCreationNotAllowedException(name, "Only beans with @ManagedResource or beans which implement " + - "org.springframework.context.Lifecycle or org.springframework.util.CustomizableThreadCreator " + - "are allowed to use as ControlBus components."); + "org.springframework.context.Lifecycle or org.springframework.util.CustomizableThreadCreator " + + "are allowed to use as ControlBus components."); } } diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java index 859c6551b2..e6cde42fc5 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import org.junit.Test; @@ -36,6 +34,8 @@ import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @since 2.2 diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java index a554de60f9..4db9625995 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -28,6 +26,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import groovy.lang.Script; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -44,7 +43,7 @@ import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.scripting.support.StaticScriptSource; import org.springframework.test.annotation.Repeat; -import groovy.lang.Script; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java index 7ad3d3c33e..6a42a71911 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,11 @@ package org.springframework.integration.groovy; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; +import groovy.lang.Binding; +import groovy.lang.MissingPropertyException; import org.junit.Rule; import org.junit.Test; @@ -32,8 +31,8 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.test.annotation.Repeat; -import groovy.lang.Binding; -import groovy.lang.MissingPropertyException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Dave Syer diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java index 5423f03c1c..97aba3f3d2 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; @@ -33,6 +31,8 @@ import org.junit.runners.model.Statement; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.test.annotation.Repeat; +import static org.assertj.core.api.Assertions.assertThat; + /** * A method rule that looks at Spring repeat annotations on methods and executes the test multiple times (without * re-initializing the test case). diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/ScriptsFactoryTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/ScriptsFactoryTests.java index e84aaca59e..0c23ac5450 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/ScriptsFactoryTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/ScriptsFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +38,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @since 5.0 diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java index 036ce8d792..608f0ba6fd 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,10 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.HashMap; import java.util.Map; +import groovy.lang.GroovyObject; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Test; @@ -46,7 +44,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import groovy.lang.GroovyObject; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** @@ -83,7 +82,7 @@ public class GroovyControlBusTests { this.groovyCustomizer.executed = false; Message message = MessageBuilder.withPayload( - "def result = service.convert('aardvark'); def foo = headers.foo; result+foo") + "def result = service.convert('aardvark'); def foo = headers.foo; result+foo") .setHeader("foo", "bar") .build(); this.input.send(message); diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java index f12dcc646f..9772408528 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.MultipleCompilationErrorsException; import org.codehaus.groovy.control.customizers.ImportCustomizer; @@ -43,6 +40,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.stereotype.Component; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java index 423aa43f44..2efb401adb 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java index 838f952cff..70564e63b5 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.beans.PropertyEditorSupport; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -33,6 +31,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan @@ -71,8 +71,8 @@ public class GroovyRefreshTests { private int count = -1; private String[] scripts = - { "\"groovy-${binding.variables['payload']}-0\"", - "\"groovy-${binding.variables['payload']}-1\"" }; + {"\"groovy-${binding.variables['payload']}-0\"", + "\"groovy-${binding.variables['payload']}-1\""}; public String getDescription() { return "CycleResource"; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java index b6fd02a0cf..14d5ac4817 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +33,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java index 3b92254311..81d51f0972 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -26,6 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import groovy.lang.GroovyObject; +import groovy.lang.MissingPropertyException; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +43,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scripting.groovy.GroovyObjectCustomizer; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import groovy.lang.GroovyObject; -import groovy.lang.MissingPropertyException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * @author Mark Fisher diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java index 1a0ea52ab9..7e2737d3d8 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +31,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java index c6bfbbdf4d..cc74d2185d 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -37,6 +35,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSourceTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSourceTests.java index 1775b8335a..1f62b0c2e1 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSourceTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/RefreshableResourceScriptSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.core.io.ByteArrayResource; import org.springframework.integration.scripting.RefreshableResourceScriptSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/ServiceActivatorParserTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/ServiceActivatorParserTests.java index d484ce0078..9d1b48e7e2 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/ServiceActivatorParserTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/ServiceActivatorParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.groovy.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidator.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidator.java index 9092ebdcce..014926aaed 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidator.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidator.java @@ -20,9 +20,6 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import org.springframework.util.CollectionUtils; -import org.springframework.util.StringUtils; - import com.hazelcast.collection.IList; import com.hazelcast.collection.IQueue; import com.hazelcast.collection.ISet; @@ -32,6 +29,9 @@ import com.hazelcast.multimap.MultiMap; import com.hazelcast.replicatedmap.ReplicatedMap; import com.hazelcast.topic.ITopic; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + /** * Common Validator for Hazelcast Integration. It validates cache types and events. * @@ -43,7 +43,7 @@ import com.hazelcast.topic.ITopic; public final class HazelcastIntegrationDefinitionValidator { public static > Set validateEnumType(final Class enumType, final String types) { - Set typeSet = StringUtils.commaDelimitedListToSet(StringUtils.trimAllWhitespace(types)); + Set typeSet = StringUtils.commaDelimitedListToSet(StringUtils.trimAllWhitespace(types)); for (String type : typeSet) { Enum.valueOf(enumType, type); } diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastLocalInstanceRegistrar.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastLocalInstanceRegistrar.java index c7f038fc25..d541c3f06d 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastLocalInstanceRegistrar.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/HazelcastLocalInstanceRegistrar.java @@ -19,17 +19,16 @@ package org.springframework.integration.hazelcast; import java.net.SocketAddress; import java.util.concurrent.locks.Lock; +import com.hazelcast.cluster.MembershipListener; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.multimap.MultiMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.integration.hazelcast.listener.HazelcastMembershipListener; -import com.hazelcast.cluster.MembershipListener; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.multimap.MultiMap; - /** * This class creates an internal configuration {@link MultiMap} to cache Hazelcast instances' socket * address information which used Hazelcast event-driven inbound channel adapter(s). It diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/AbstractHazelcastMessageProducer.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/AbstractHazelcastMessageProducer.java index b6a3307f88..d03c85b2da 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/AbstractHazelcastMessageProducer.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/AbstractHazelcastMessageProducer.java @@ -25,16 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.springframework.integration.endpoint.MessageProducerSupport; -import org.springframework.integration.hazelcast.CacheEventType; -import org.springframework.integration.hazelcast.CacheListeningPolicyType; -import org.springframework.integration.hazelcast.HazelcastHeaders; -import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; -import org.springframework.integration.hazelcast.HazelcastLocalInstanceRegistrar; -import org.springframework.integration.hazelcast.message.EntryEventMessagePayload; -import org.springframework.messaging.Message; -import org.springframework.util.Assert; - import com.hazelcast.core.DistributedObject; import com.hazelcast.core.EntryEvent; import com.hazelcast.core.EntryListener; @@ -45,6 +35,16 @@ import com.hazelcast.map.AbstractIMapEvent; import com.hazelcast.map.MapEvent; import com.hazelcast.multimap.MultiMap; +import org.springframework.integration.endpoint.MessageProducerSupport; +import org.springframework.integration.hazelcast.CacheEventType; +import org.springframework.integration.hazelcast.CacheListeningPolicyType; +import org.springframework.integration.hazelcast.HazelcastHeaders; +import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; +import org.springframework.integration.hazelcast.HazelcastLocalInstanceRegistrar; +import org.springframework.integration.hazelcast.message.EntryEventMessagePayload; +import org.springframework.messaging.Message; +import org.springframework.util.Assert; + /** * Hazelcast Base Event-Driven Message Producer. * diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorMessageProducer.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorMessageProducer.java index ce51d3dcec..b979a3d7b3 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorMessageProducer.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorMessageProducer.java @@ -22,11 +22,6 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.endpoint.MessageProducerSupport; -import org.springframework.integration.hazelcast.ClusterMonitorType; -import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; -import org.springframework.util.Assert; - import com.hazelcast.client.Client; import com.hazelcast.client.ClientListener; import com.hazelcast.cluster.MembershipEvent; @@ -40,6 +35,11 @@ import com.hazelcast.partition.MigrationListener; import com.hazelcast.partition.MigrationState; import com.hazelcast.partition.ReplicaMigrationEvent; +import org.springframework.integration.endpoint.MessageProducerSupport; +import org.springframework.integration.hazelcast.ClusterMonitorType; +import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; +import org.springframework.util.Assert; + /** * Hazelcast Cluster Monitor Event Driven Message Producer is a message producer which * enables {@link HazelcastClusterMonitorMessageProducer.HazelcastClusterMonitorListener} @@ -89,13 +89,13 @@ public class HazelcastClusterMonitorMessageProducer extends MessageProducerSuppo if (this.monitorTypes.contains(ClusterMonitorType.MIGRATION.name())) { final UUID registrationId = this.hazelcastInstance.getPartitionService() .addMigrationListener(clusterMonitorListener); - this.hazelcastRegisteredListenerIdMap.put(ClusterMonitorType.MIGRATION, registrationId); + this.hazelcastRegisteredListenerIdMap.put(ClusterMonitorType.MIGRATION, registrationId); } if (this.monitorTypes.contains(ClusterMonitorType.LIFECYCLE.name())) { final UUID registrationId = this.hazelcastInstance.getLifecycleService() .addLifecycleListener(clusterMonitorListener); - this.hazelcastRegisteredListenerIdMap.put(ClusterMonitorType.LIFECYCLE, registrationId); + this.hazelcastRegisteredListenerIdMap.put(ClusterMonitorType.LIFECYCLE, registrationId); } if (this.monitorTypes.contains(ClusterMonitorType.CLIENT.name())) { diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastContinuousQueryMessageProducer.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastContinuousQueryMessageProducer.java index 19a03bf303..9636e71564 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastContinuousQueryMessageProducer.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastContinuousQueryMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package org.springframework.integration.hazelcast.inbound; -import org.springframework.util.Assert; - import com.hazelcast.map.IMap; import com.hazelcast.query.impl.predicates.SqlPredicate; +import org.springframework.util.Assert; + /** * Hazelcast Continuous Query Message Producer is a message producer which enables * {@link AbstractHazelcastMessageProducer.HazelcastEntryListener} with a @@ -47,7 +47,7 @@ public class HazelcastContinuousQueryMessageProducer extends AbstractHazelcastMe this.includeValue = includeValue; } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Override protected void doStart() { setHazelcastRegisteredEventListenerId(((IMap) this.distributedObject) diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java index 333ab5ddc8..bb25ad18d7 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,14 +19,14 @@ package org.springframework.integration.hazelcast.inbound; import java.util.Collection; import java.util.Collections; +import com.hazelcast.map.IMap; +import com.hazelcast.query.impl.predicates.SqlPredicate; + import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.integration.hazelcast.DistributedSQLIterationType; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import com.hazelcast.map.IMap; -import com.hazelcast.query.impl.predicates.SqlPredicate; - /** * Hazelcast Distributed SQL Message Source is a message source which runs defined * distributed query in the cluster and returns results in the light of iteration type. diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastEventDrivenMessageProducer.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastEventDrivenMessageProducer.java index 491c747280..05a5eca15e 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastEventDrivenMessageProducer.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastEventDrivenMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,6 @@ package org.springframework.integration.hazelcast.inbound; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.hazelcast.HazelcastHeaders; -import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; -import org.springframework.util.Assert; - import com.hazelcast.collection.IList; import com.hazelcast.collection.IQueue; import com.hazelcast.collection.ISet; @@ -38,6 +34,10 @@ import com.hazelcast.topic.ITopic; import com.hazelcast.topic.Message; import com.hazelcast.topic.MessageListener; +import org.springframework.integration.hazelcast.HazelcastHeaders; +import org.springframework.integration.hazelcast.HazelcastIntegrationDefinitionValidator; +import org.springframework.util.Assert; + /** * Hazelcast Event Driven Message Producer is a message producer which enables * {@link AbstractHazelcastMessageProducer.HazelcastEntryListener}, @@ -63,7 +63,7 @@ public class HazelcastEventDrivenMessageProducer extends AbstractHazelcastMessag } @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) protected void doStart() { if (this.distributedObject instanceof IMap) { setHazelcastRegisteredEventListenerId(((IMap) this.distributedObject) diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java index 41cb1238a9..c83849ca02 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/leader/LeaderInitiator.java @@ -24,6 +24,9 @@ import java.util.concurrent.Future; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.cp.CPSubsystem; +import com.hazelcast.cp.lock.FencedLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,10 +42,6 @@ import org.springframework.integration.leader.event.LeaderEventPublisher; import org.springframework.integration.support.leader.LockRegistryLeaderInitiator; import org.springframework.util.Assert; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.cp.CPSubsystem; -import com.hazelcast.cp.lock.FencedLock; - /** * Bootstrap leadership {@link org.springframework.integration.leader.Candidate candidates} * with Hazelcast. Upon construction, {@link #start} must be invoked to diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/listener/HazelcastMembershipListener.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/listener/HazelcastMembershipListener.java index faa0bc8c68..09da083a66 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/listener/HazelcastMembershipListener.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/listener/HazelcastMembershipListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,6 @@ import java.net.SocketAddress; import java.util.Set; import java.util.concurrent.locks.Lock; -import org.springframework.integration.hazelcast.HazelcastLocalInstanceRegistrar; - import com.hazelcast.cluster.MembershipAdapter; import com.hazelcast.cluster.MembershipEvent; import com.hazelcast.core.Hazelcast; @@ -29,6 +27,8 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.instance.EndpointQualifier; import com.hazelcast.multimap.MultiMap; +import org.springframework.integration.hazelcast.HazelcastLocalInstanceRegistrar; + /** * Hazelcast {@link MembershipAdapter} in order to listen for membership updates in the cluster. * diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistry.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistry.java index d0109470b9..bc5d9da696 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistry.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ package org.springframework.integration.hazelcast.lock; import java.util.concurrent.locks.Lock; +import com.hazelcast.core.HazelcastInstance; + import org.springframework.integration.support.locks.LockRegistry; import org.springframework.util.Assert; -import com.hazelcast.core.HazelcastInstance; - /** * A {@link LockRegistry} implementation Hazelcast distributed locks. * diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStore.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStore.java index 68444916a2..b8e3f77b34 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStore.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStore.java @@ -19,11 +19,6 @@ package org.springframework.integration.hazelcast.metadata; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.metadata.ListenableMetadataStore; -import org.springframework.integration.metadata.MetadataStoreListener; -import org.springframework.util.Assert; - import com.hazelcast.core.EntryEvent; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; @@ -31,6 +26,11 @@ import com.hazelcast.map.listener.EntryAddedListener; import com.hazelcast.map.listener.EntryRemovedListener; import com.hazelcast.map.listener.EntryUpdatedListener; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.metadata.ListenableMetadataStore; +import org.springframework.integration.metadata.MetadataStoreListener; +import org.springframework.util.Assert; + /** * The Hazelcast {@link IMap}-based {@link ListenableMetadataStore} implementation. * diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/outbound/HazelcastCacheWritingMessageHandler.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/outbound/HazelcastCacheWritingMessageHandler.java index 32e9cd829c..e9d7e8e361 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/outbound/HazelcastCacheWritingMessageHandler.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/outbound/HazelcastCacheWritingMessageHandler.java @@ -19,6 +19,10 @@ package org.springframework.integration.hazelcast.outbound; import java.util.Collection; import java.util.Map; +import com.hazelcast.core.DistributedObject; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.topic.ITopic; + import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.integration.expression.ExpressionUtils; @@ -27,10 +31,6 @@ import org.springframework.integration.hazelcast.HazelcastHeaders; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import com.hazelcast.core.DistributedObject; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.topic.ITopic; - /** * MessageHandler implementation that writes {@link Message} or payload to defined * Hazelcast distributed cache object. @@ -78,7 +78,7 @@ public class HazelcastCacheWritingMessageHandler extends AbstractMessageHandler } @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) protected void handleMessageInternal(final Message message) { Object objectToStore = message; if (this.extractPayload) { diff --git a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/store/HazelcastMessageStore.java b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/store/HazelcastMessageStore.java index 851875f041..a6e3cb51db 100644 --- a/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/store/HazelcastMessageStore.java +++ b/spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/store/HazelcastMessageStore.java @@ -18,14 +18,14 @@ package org.springframework.integration.hazelcast.store; import java.util.Collection; -import org.springframework.integration.store.AbstractKeyValueMessageStore; -import org.springframework.util.Assert; - import com.hazelcast.core.HazelcastInstance; import com.hazelcast.map.IMap; import com.hazelcast.query.Predicates; import com.hazelcast.query.QueryConstants; +import org.springframework.integration.store.AbstractKeyValueMessageStore; +import org.springframework.util.Assert; + /** * The Hazelcast {@link IMap}-based {@link AbstractKeyValueMessageStore} implementation. * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidatorTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidatorTests.java index 35ede89bf9..a8bf3be7d6 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidatorTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/HazelcastIntegrationDefinitionValidatorTests.java @@ -16,11 +16,12 @@ package org.springframework.integration.hazelcast; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashSet; import java.util.Set; +import com.hazelcast.collection.IList; +import com.hazelcast.core.DistributedObject; +import com.hazelcast.instance.impl.HazelcastInstanceFactory; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,9 +31,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.collection.IList; -import com.hazelcast.core.DistributedObject; -import com.hazelcast.instance.impl.HazelcastInstanceFactory; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Integration Definition Validator Test Class @@ -45,7 +44,7 @@ import com.hazelcast.instance.impl.HazelcastInstanceFactory; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "rawtypes" }) +@SuppressWarnings({"rawtypes"}) public class HazelcastIntegrationDefinitionValidatorTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/IdempotentReceiverIntegrationTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/IdempotentReceiverIntegrationTests.java index 4411f754f7..eb44b79dbe 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/IdempotentReceiverIntegrationTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/IdempotentReceiverIntegrationTests.java @@ -16,16 +16,14 @@ package org.springframework.integration.hazelcast; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.spy; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; import org.aopalliance.aop.Advice; import org.junit.jupiter.api.Test; @@ -71,8 +69,9 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.transaction.support.TransactionSynchronizationManager; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.spy; /** * @author Artem Bilan @@ -290,9 +289,9 @@ public class IdempotentReceiverIntegrationTests { @Bean @org.springframework.integration.annotation.Transformer(inputChannel = "input", outputChannel = "output", - adviceChain = { "fooAdvice", + adviceChain = {"fooAdvice", "idempotentReceiverInterceptor", - "transactionInterceptor" }) + "transactionInterceptor"}) public Transformer transformer() { return message -> message; } diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastCQDistributedMapInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastCQDistributedMapInboundChannelAdapterTests.java index 36a226e5ab..71e5cda58b 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastCQDistributedMapInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastCQDistributedMapInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.core.EntryEventType; +import com.hazelcast.map.IMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +32,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.core.EntryEventType; -import com.hazelcast.map.IMap; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Continuous Query Inbound Channel Adapter Unit Test Class @@ -44,7 +43,7 @@ import com.hazelcast.map.IMap; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastCQDistributedMapInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorInboundChannelAdapterTests.java index bc6b3b87e2..5171660137 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastClusterMonitorInboundChannelAdapterTests.java @@ -16,8 +16,10 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.core.LifecycleEvent; +import com.hazelcast.core.LifecycleEvent.LifecycleState; +import com.hazelcast.instance.impl.HazelcastInstanceFactory; import org.junit.AfterClass; import org.junit.Ignore; import org.junit.Test; @@ -31,10 +33,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.LifecycleEvent; -import com.hazelcast.core.LifecycleEvent.LifecycleState; -import com.hazelcast.instance.impl.HazelcastInstanceFactory; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Cluster Monitor Inbound Channel Adapter Unit Test Class @@ -109,5 +108,4 @@ public class HazelcastClusterMonitorInboundChannelAdapterTests { assertThat(((LifecycleEvent) msg.getPayload()).getState()).isEqualTo(lifecycleState); } - } diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedListEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedListEventDrivenInboundChannelAdapterTests.java index 162b84a86a..39aff6b3f4 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedListEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedListEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.collection.IList; +import com.hazelcast.core.EntryEventType; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +31,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.collection.IList; -import com.hazelcast.core.EntryEventType; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Distributed List Event Driven Inbound Channel Adapter Test Class @@ -43,7 +42,7 @@ import com.hazelcast.core.EntryEventType; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedListEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedMapEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedMapEventDrivenInboundChannelAdapterTests.java index 00f8dbb6c8..613521adb0 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedMapEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedMapEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.core.EntryEventType; +import com.hazelcast.map.IMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +32,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.core.EntryEventType; -import com.hazelcast.map.IMap; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Distributed Map Event Driven Inbound Channel Adapter Test @@ -44,7 +43,7 @@ import com.hazelcast.map.IMap; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedMapEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedQueueEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedQueueEventDrivenInboundChannelAdapterTests.java index fe16d1c70c..55376190ec 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedQueueEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedQueueEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.collection.IQueue; +import com.hazelcast.core.EntryEventType; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +31,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.collection.IQueue; -import com.hazelcast.core.EntryEventType; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Distributed Queue Event Driven Inbound Channel Adapter Test @@ -43,7 +42,7 @@ import com.hazelcast.core.EntryEventType; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedQueueEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLInboundChannelAdapterTests.java index 64dae02d1a..5deb3f0458 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLInboundChannelAdapterTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.hazelcast.inbound; +import com.hazelcast.map.IMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,8 +27,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.map.IMap; - /** * Hazelcast Distributed SQL Inbound Channel Adapter Test * @@ -37,7 +36,7 @@ import com.hazelcast.map.IMap; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedSQLInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSetEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSetEventDrivenInboundChannelAdapterTests.java index d46da4a404..0b66aa002e 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSetEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSetEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.collection.ISet; +import com.hazelcast.core.EntryEventType; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +31,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.collection.ISet; -import com.hazelcast.core.EntryEventType; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Distributed Set Event Driven Inbound Channel Adapter Test @@ -43,7 +42,7 @@ import com.hazelcast.core.EntryEventType; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedSetEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedTopicEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedTopicEventDrivenInboundChannelAdapterTests.java index 0859956a1d..a2440edbac 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedTopicEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedTopicEventDrivenInboundChannelAdapterTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.hazelcast.inbound; +import com.hazelcast.topic.ITopic; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,8 +27,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.topic.ITopic; - /** * Hazelcast Distributed Topic Event Driven Inbound Channel Adapter Test * @@ -37,7 +36,7 @@ import com.hazelcast.topic.ITopic; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastDistributedTopicEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastMultiMapEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastMultiMapEventDrivenInboundChannelAdapterTests.java index a73674512d..07e4e8e8a6 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastMultiMapEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastMultiMapEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.core.EntryEventType; +import com.hazelcast.multimap.MultiMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +32,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.core.EntryEventType; -import com.hazelcast.multimap.MultiMap; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast MultiMap Event Driven Inbound Channel Adapter Test @@ -45,7 +44,7 @@ import com.hazelcast.multimap.MultiMap; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastMultiMapEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests.java index e523ea035f..306c80ae6c 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.hazelcast.inbound; -import static org.assertj.core.api.Assertions.assertThat; - +import com.hazelcast.core.EntryEventType; +import com.hazelcast.replicatedmap.ReplicatedMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,8 +32,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.core.EntryEventType; -import com.hazelcast.replicatedmap.ReplicatedMap; +import static org.assertj.core.api.Assertions.assertThat; /** * Hazelcast Replicated Map Event Driven Inbound Channel Adapter Test @@ -44,7 +43,7 @@ import com.hazelcast.replicatedmap.ReplicatedMap; @RunWith(SpringRunner.class) @ContextConfiguration @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastReplicatedMapEventDrivenInboundChannelAdapterTests { @Autowired diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastCQDistributedMapInboundChannelAdapterConfigTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastCQDistributedMapInboundChannelAdapterConfigTests.java index 02b97f03a6..8d3dc72402 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastCQDistributedMapInboundChannelAdapterConfigTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastCQDistributedMapInboundChannelAdapterConfigTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.hazelcast.inbound.config; +import com.hazelcast.map.IMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,8 +29,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import com.hazelcast.map.IMap; - /** * Hazelcast Continuous Query Inbound Channel Adapter JavaConfig driven Unit Test Class * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastClusterMonitorInboundChannelAdapterConfigTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastClusterMonitorInboundChannelAdapterConfigTests.java index 113d895ce3..6b550c03ce 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastClusterMonitorInboundChannelAdapterConfigTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastClusterMonitorInboundChannelAdapterConfigTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.hazelcast.inbound.config; +import com.hazelcast.core.HazelcastInstance; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,8 +27,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.hazelcast.core.HazelcastInstance; - /** * Hazelcast Cluster Monitor Inbound Channel Adapter JavaConfig driven Unit Test Class * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastDistributedSQLInboundChannelAdapterConfigTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastDistributedSQLInboundChannelAdapterConfigTests.java index 42da06857f..e5d8921ca5 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastDistributedSQLInboundChannelAdapterConfigTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastDistributedSQLInboundChannelAdapterConfigTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.hazelcast.inbound.config; +import com.hazelcast.map.IMap; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,8 +29,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import com.hazelcast.map.IMap; - /** * Hazelcast Distributed SQL Inbound Channel Adapter JavaConfig driven Unit Test Class * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastEventDrivenInboundChannelAdapterConfigTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastEventDrivenInboundChannelAdapterConfigTests.java index 5b3b97e8bb..31dde31112 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastEventDrivenInboundChannelAdapterConfigTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastEventDrivenInboundChannelAdapterConfigTests.java @@ -16,6 +16,13 @@ package org.springframework.integration.hazelcast.inbound.config; +import com.hazelcast.collection.IList; +import com.hazelcast.collection.IQueue; +import com.hazelcast.collection.ISet; +import com.hazelcast.map.IMap; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,14 +35,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import com.hazelcast.collection.IList; -import com.hazelcast.collection.IQueue; -import com.hazelcast.collection.ISet; -import com.hazelcast.map.IMap; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; - /** * Hazelcast Event Driven Inbound Channel Adapter JavaConfig driven Unit Test Class * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastIntegrationInboundTestConfiguration.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastIntegrationInboundTestConfiguration.java index 980c955d11..15e8f5d10d 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastIntegrationInboundTestConfiguration.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/config/HazelcastIntegrationInboundTestConfiguration.java @@ -16,6 +16,17 @@ package org.springframework.integration.hazelcast.inbound.config; +import com.hazelcast.collection.IList; +import com.hazelcast.collection.IQueue; +import com.hazelcast.collection.ISet; +import com.hazelcast.config.Config; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.annotation.InboundChannelAdapter; @@ -31,17 +42,6 @@ import org.springframework.integration.hazelcast.inbound.HazelcastDistributedSQL import org.springframework.integration.hazelcast.inbound.HazelcastEventDrivenMessageProducer; import org.springframework.messaging.PollableChannel; -import com.hazelcast.collection.IList; -import com.hazelcast.collection.IQueue; -import com.hazelcast.collection.ISet; -import com.hazelcast.config.Config; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; - /** * Configuration Class for Hazelcast Integration Inbound Test * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/util/HazelcastInboundChannelAdapterTestUtils.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/util/HazelcastInboundChannelAdapterTestUtils.java index 40a9b196a7..9b2227a4a4 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/util/HazelcastInboundChannelAdapterTestUtils.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/inbound/util/HazelcastInboundChannelAdapterTestUtils.java @@ -16,18 +16,9 @@ package org.springframework.integration.hazelcast.inbound.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Collection; import java.util.Map; -import org.springframework.integration.hazelcast.HazelcastHeaders; -import org.springframework.integration.hazelcast.HazelcastIntegrationTestUser; -import org.springframework.integration.hazelcast.message.EntryEventMessagePayload; -import org.springframework.messaging.Message; -import org.springframework.messaging.PollableChannel; - import com.hazelcast.cluster.MembershipEvent; import com.hazelcast.collection.ICollection; import com.hazelcast.core.DistributedObjectEvent; @@ -39,6 +30,15 @@ import com.hazelcast.replicatedmap.ReplicatedMap; import com.hazelcast.spi.exception.DistributedObjectDestroyedException; import com.hazelcast.topic.ITopic; +import org.springframework.integration.hazelcast.HazelcastHeaders; +import org.springframework.integration.hazelcast.HazelcastIntegrationTestUser; +import org.springframework.integration.hazelcast.message.EntryEventMessagePayload; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * Util Class for Hazelcast Inbound Channel Adapters Test Support. * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/leader/LeaderInitiatorTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/leader/LeaderInitiatorTests.java index 1e9a384548..e62bb98788 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/leader/LeaderInitiatorTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/leader/LeaderInitiatorTests.java @@ -16,16 +16,14 @@ package org.springframework.integration.hazelcast.leader; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.spy; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import com.hazelcast.config.Config; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,9 +40,10 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.hazelcast.config.Config; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.spy; /** * Tests for hazelcast leader election. diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistryTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistryTests.java index 4cc8355b62..d254d8ec75 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistryTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/lock/HazelcastLockRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.hazelcast.lock; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -25,14 +23,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; -import org.junit.AfterClass; -import org.junit.Test; - import com.hazelcast.config.Config; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.cp.lock.FencedLock; import com.hazelcast.instance.impl.HazelcastInstanceFactory; +import org.junit.AfterClass; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStoreTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStoreTests.java index be15a7607a..dd7ccdee01 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStoreTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/metadata/HazelcastMetadataStoreTests.java @@ -16,11 +16,9 @@ package org.springframework.integration.hazelcast.metadata; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -29,9 +27,10 @@ import org.junit.Test; import org.springframework.integration.metadata.MetadataStoreListener; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; /** * @author Vinicius Carvalho diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/HazelcastOutboundChannelAdapterTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/HazelcastOutboundChannelAdapterTests.java index fb7480206a..fe6d70672b 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/HazelcastOutboundChannelAdapterTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/HazelcastOutboundChannelAdapterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.hazelcast.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -31,10 +29,13 @@ import java.util.TreeMap; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import com.hazelcast.instance.impl.HazelcastInstanceFactory; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -49,13 +50,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.hazelcast.instance.impl.HazelcastInstanceFactory; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * Hazelcast Outbound Channel Adapter Test Class. @@ -65,10 +63,9 @@ import com.hazelcast.topic.ITopic; * * @since 6.0 */ -@RunWith(SpringRunner.class) -@ContextConfiguration +@SpringJUnitConfig @DirtiesContext -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public class HazelcastOutboundChannelAdapterTests { private static final String DISTRIBUTED_MAP = "distributedMap"; @@ -246,12 +243,12 @@ public class HazelcastOutboundChannelAdapterTests { @Qualifier("testTopicRequestHandlerAdvice") private HazelcastTestRequestHandlerAdvice testTopicRequestHandlerAdvice; - @AfterClass + @AfterAll public static void shutdown() { HazelcastInstanceFactory.terminateAll(); } - @Before + @BeforeEach public void setUp() { this.distributedMap.clear(); this.distributedBulkMap.clear(); @@ -330,10 +327,8 @@ public class HazelcastOutboundChannelAdapterTests { public void testBulkWriteToReplicatedMap() throws InterruptedException { Map userMap = new HashMap<>(HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT); - for (int index = 1; - index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { - userMap - .put(index, HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)); + for (int index = 1; index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { + userMap.put(index, HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)); } this.bulkReplicatedMapChannel.send(new GenericMessage<>(userMap)); @@ -356,8 +351,7 @@ public class HazelcastOutboundChannelAdapterTests { public void testBulkWriteToDistributedList() throws InterruptedException { List userList = new ArrayList<>(HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT); - for (int index = 1; - index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { + for (int index = 1; index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { userList.add(HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)); } @@ -381,8 +375,7 @@ public class HazelcastOutboundChannelAdapterTests { public void testBulkWriteToDistributedSet() throws InterruptedException { Set userSet = new HashSet<>(HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT); - for (int index = 1; - index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { + for (int index = 1; index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { userSet.add(HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)); } @@ -408,8 +401,7 @@ public class HazelcastOutboundChannelAdapterTests { public void testBulkWriteToDistributedQueue() throws InterruptedException { Queue userQueue = new ArrayBlockingQueue(HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT); - for (int index = 1; - index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { + for (int index = 1; index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { userQueue.add(HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)); } @@ -429,29 +421,33 @@ public class HazelcastOutboundChannelAdapterTests { this.testTopicRequestHandlerAdvice); } - @Test(expected = MessageHandlingException.class) + @Test public void testWriteToDistributedMapWhenCacheIsNotSet() { - this.fifthMapChannel.send(new GenericMessage<>( - HazelcastOutboundChannelAdapterTestUtils.getTestUser(1))); + assertThatExceptionOfType(MessageHandlingException.class) + .isThrownBy(() -> + this.fifthMapChannel.send( + new GenericMessage<>(HazelcastOutboundChannelAdapterTestUtils.getTestUser(1)))); } - @Test(expected = MessageHandlingException.class) + @Test public void testWriteToDistributedMapWhenKeyExpressionIsNotSet() { Message message = this.messageBuilderFactory .withPayload(HazelcastOutboundChannelAdapterTestUtils.getTestUser(1)) .setHeader(HazelcastHeaders.CACHE_NAME, DISTRIBUTED_MAP).build(); - this.sixthMapChannel.send(message); + assertThatExceptionOfType(MessageHandlingException.class) + .isThrownBy(() -> this.sixthMapChannel.send(message)); } - @Test(expected = MessageHandlingException.class) + @Test public void testWriteToLock() { - this.lockChannel.send(new GenericMessage<>("foo")); + assertThatExceptionOfType(MessageHandlingException.class) + .isThrownBy(() -> this.lockChannel.send(new GenericMessage<>("foo"))); } private void sendMessageWithCacheHeaderToChannel(final MessageChannel channel, final String headerName, final String distributedObjectName) { - for (int index = 1; - index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { + + for (int index = 1; index <= HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT; index++) { Message message = this.messageBuilderFactory .withPayload(HazelcastOutboundChannelAdapterTestUtils.getTestUser(index)) .setHeader(headerName, distributedObjectName).build(); @@ -459,8 +455,7 @@ public class HazelcastOutboundChannelAdapterTests { } } - private void verifyMapForMessage( - final Map> map) { + private static void verifyMapForMessage(final Map> map) { int index = 1; assertThat(map).isNotNull(); assertThat(map.size()).isEqualTo(HazelcastOutboundChannelAdapterTestUtils.DATA_COUNT); diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastIntegrationOutboundTestConfiguration.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastIntegrationOutboundTestConfiguration.java index 1a018a941f..63117ceb59 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastIntegrationOutboundTestConfiguration.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastIntegrationOutboundTestConfiguration.java @@ -20,6 +20,14 @@ import java.util.List; import java.util.Queue; import java.util.Set; +import com.hazelcast.core.DistributedObject; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.expression.spel.standard.SpelExpressionParser; @@ -32,14 +40,6 @@ import org.springframework.integration.hazelcast.outbound.HazelcastCacheWritingM import org.springframework.integration.hazelcast.outbound.util.HazelcastOutboundChannelAdapterTestUtils; import org.springframework.messaging.MessageChannel; -import com.hazelcast.core.DistributedObject; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; - /** * Configuration Class for Hazelcast Integration Outbound Test * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastOutboundChannelAdapterConfigTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastOutboundChannelAdapterConfigTests.java index a480090f68..6519363c80 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastOutboundChannelAdapterConfigTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/config/HazelcastOutboundChannelAdapterConfigTests.java @@ -20,6 +20,11 @@ import java.util.List; import java.util.Queue; import java.util.Set; +import com.hazelcast.instance.impl.HazelcastInstanceFactory; +import com.hazelcast.map.IMap; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -32,12 +37,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.hazelcast.instance.impl.HazelcastInstanceFactory; -import com.hazelcast.map.IMap; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; - /** * Hazelcast Outbound Channel Adapter JavaConfig driven Unit Test Class * diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java index 0905e57423..01952c1d41 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/outbound/util/HazelcastOutboundChannelAdapterTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.hazelcast.outbound.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,15 +29,18 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.concurrent.TimeUnit; +import com.hazelcast.multimap.MultiMap; +import com.hazelcast.replicatedmap.ReplicatedMap; +import com.hazelcast.topic.ITopic; +import com.hazelcast.topic.MessageListener; + import org.springframework.integration.hazelcast.HazelcastIntegrationTestUser; import org.springframework.integration.hazelcast.HazelcastTestRequestHandlerAdvice; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; -import com.hazelcast.multimap.MultiMap; -import com.hazelcast.replicatedmap.ReplicatedMap; -import com.hazelcast.topic.ITopic; -import com.hazelcast.topic.MessageListener; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * Util Class for Hazelcast Outbound Channel Adapter Test Support @@ -49,7 +49,7 @@ import com.hazelcast.topic.MessageListener; * * @since 6.0 */ -@SuppressWarnings({ "unchecked", "rawtypes" }) +@SuppressWarnings({"unchecked", "rawtypes"}) public final class HazelcastOutboundChannelAdapterTestUtils { public static final int DATA_COUNT = 100; diff --git a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/store/HazelcastMessageStoreTests.java b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/store/HazelcastMessageStoreTests.java index 7b0fa42212..23cd21d10c 100644 --- a/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/store/HazelcastMessageStoreTests.java +++ b/spring-integration-hazelcast/src/test/java/org/springframework/integration/hazelcast/store/HazelcastMessageStoreTests.java @@ -16,12 +16,13 @@ package org.springframework.integration.hazelcast.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.Properties; +import com.hazelcast.core.Hazelcast; +import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.map.IMap; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -35,9 +36,7 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.map.IMap; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Vinicius Carvalho diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java index be506e6d10..fb3224fbdb 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/EnableIntegrationGraphController.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,6 +69,6 @@ public @interface EnableIntegrationGraphController { * @return the URLs. * @since 4.3.5 */ - String[] allowedOrigins() default { }; + String[] allowedOrigins() default {}; } diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java index 4abf411659..7df8ecebfa 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpInboundEndpointParser.java @@ -222,7 +222,7 @@ public class HttpInboundEndpointParser extends AbstractSingleBeanDefinitionParse if (crossOriginElement != null) { BeanDefinitionBuilder crossOriginBuilder = BeanDefinitionBuilder.genericBeanDefinition(CrossOrigin.class); - String[] attributes = { "origin", "allowed-headers", "exposed-headers", "max-age", "method" }; + String[] attributes = {"origin", "allowed-headers", "exposed-headers", "max-age", "method"}; for (String crossOriginAttribute : attributes) { IntegrationNamespaceUtils.setValueIfAttributeDefined(crossOriginBuilder, crossOriginElement, crossOriginAttribute); @@ -247,7 +247,7 @@ public class HttpInboundEndpointParser extends AbstractSingleBeanDefinitionParse Element requestMappingElement = DomUtils.getChildElementByTagName(element, "request-mapping"); if (requestMappingElement != null) { - for (String requestMappingAttribute : new String[]{ "params", "headers", "consumes", "produces" }) { + for (String requestMappingAttribute : new String[] {"params", "headers", "consumes", "produces"}) { IntegrationNamespaceUtils.setValueIfAttributeDefined(requestMappingDefBuilder, requestMappingElement, requestMappingAttribute); } diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java index d1ef08e0dd..a8cdcc6eb1 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/CrossOrigin.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,13 +34,13 @@ import org.springframework.web.bind.annotation.RequestMethod; */ public class CrossOrigin { - private String[] origin = { "*" }; + private String[] origin = {"*"}; - private String[] allowedHeaders = { "*" }; + private String[] allowedHeaders = {"*"}; - private String[] exposedHeaders = { }; + private String[] exposedHeaders = {}; - private RequestMethod[] method = { }; + private RequestMethod[] method = {}; private Boolean allowCredentials = true; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java index e9eafe0fac..36dfebbeb8 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -191,7 +191,7 @@ public class HttpRequestHandlingController extends HttpRequestHandlingEndpointSu MapBindingResult errors = new MapBindingResult(new HashMap(), "dummy"); PrintWriter stackTrace = new PrintWriter(new StringWriter()); e.printStackTrace(stackTrace); - errors.reject(this.errorCode, new Object[] { e, e.getMessage(), stackTrace.toString() }, + errors.reject(this.errorCode, new Object[] {e, e.getMessage(), stackTrace.toString()}, "A Spring Integration handler raised an exception while handling an HTTP request. " + "The exception is of type " + e.getClass() + " and it has a message: (" + e.getMessage() + ")"); diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java index c3e356dc4b..0e90828e89 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -500,7 +500,7 @@ public abstract class HttpRequestHandlingEndpointSupport extends BaseHttpInbound return new RequestEntity<>(requestBody, request.getHeaders(), request.getMethod(), request.getURI()); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) protected Object extractRequestBody(ServletServerHttpRequest request) throws IOException { MediaType contentType = request.getHeaders().getContentType(); if (contentType == null) { diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java index 6deb5d07fe..103ecfb87e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/RequestMapping.java @@ -40,15 +40,15 @@ public class RequestMapping { private String[] pathPatterns; - private HttpMethod[] methods = { HttpMethod.GET, HttpMethod.POST }; + private HttpMethod[] methods = {HttpMethod.GET, HttpMethod.POST}; - private String[] params = { }; + private String[] params = {}; - private String[] headers = { }; + private String[] headers = {}; - private String[] consumes = { }; + private String[] consumes = {}; - private String[] produces = { }; + private String[] produces = {}; public String getName() { return this.name; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java index eab95bdf30..9aceb7375e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/management/IntegrationGraphController.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController; public class IntegrationGraphController { static final String REQUEST_MAPPING_PATH_VARIABLE = - "${" + HttpContextUtils.GRAPH_CONTROLLER_PATH_PROPERTY + ":" + + "${" + HttpContextUtils.GRAPH_CONTROLLER_PATH_PROPERTY + ":" + HttpContextUtils.GRAPH_CONTROLLER_DEFAULT_PATH + "}"; private final IntegrationGraphServer integrationGraphServer; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index 33a63bb961..c47dbe912e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -184,10 +184,10 @@ public class DefaultHttpHeaderMapper implements HeaderMapper, BeanF private static final Set HTTP_RESPONSE_HEADER_NAMES_LOWER = new HashSet<>(); - private static final String[] HTTP_REQUEST_HEADER_NAMES_OUTBOUND_EXCLUSIONS = { }; + private static final String[] HTTP_REQUEST_HEADER_NAMES_OUTBOUND_EXCLUSIONS = {}; private static final String[] HTTP_RESPONSE_HEADER_NAMES_INBOUND_EXCLUSIONS = - { HttpHeaders.CONTENT_LENGTH, HttpHeaders.TRANSFER_ENCODING }; + {HttpHeaders.CONTENT_LENGTH, HttpHeaders.TRANSFER_ENCODING}; public static final String HTTP_REQUEST_HEADER_NAME_PATTERN = "HTTP_REQUEST_HEADERS"; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java index ce883ee224..db5164600c 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.http; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.isNull; - import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; @@ -57,6 +54,9 @@ import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.isNull; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/ChainElementsTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/ChainElementsTests.java index ea11ec0a19..a42d9f2007 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/ChainElementsTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/ChainElementsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.util.Properties; @@ -32,6 +29,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gunnar Hillert @@ -43,7 +43,7 @@ public class ChainElementsTests { @Test public void chainOutboundGateway() throws Exception { - try { + try { bootStrap("http-outbound-gateway"); fail("Expected a BeanDefinitionParsingException to be thrown."); } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests.java index 17702c5623..852e8ff831 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java index 9df199f43d..2351e5cc74 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.BDDMockito.willReturn; - import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import java.io.Serializable; @@ -29,7 +24,6 @@ import java.util.Map; import java.util.Properties; import jakarta.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -58,6 +52,11 @@ import org.springframework.validation.Validator; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.servlet.HandlerMapping; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.willReturn; + /** * @author Mark Fisher diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java index ea24711847..d96824a80f 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.integration.test.util.TestUtils.getPropertyValue; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -26,7 +23,6 @@ import java.util.List; import java.util.Map; import jakarta.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -52,6 +48,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.util.TestUtils.getPropertyValue; + /** * @author Mark Fisher * @author Iwein Fuld diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java index 88ada16653..66faf0389e 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.nio.charset.StandardCharsets; import java.util.Map; @@ -51,6 +48,9 @@ import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.DefaultUriBuilderFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java index 1dc8ea9611..a4eae8d56b 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.nio.charset.StandardCharsets; import java.util.Map; @@ -49,6 +46,9 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ObjectUtils; import org.springframework.web.client.ResponseErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java index 6fb10b37ec..3154ae0f54 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; -import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,6 +35,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.web.client.RestTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java index a500d5af44..90f8189706 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java @@ -16,13 +16,6 @@ package org.springframework.integration.http.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; -import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; -import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; - import java.util.Collections; import org.junit.jupiter.api.BeforeEach; @@ -45,6 +38,13 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.client.MockRestServiceServer; import org.springframework.web.client.RestTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.header; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; +import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; +import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java index d84cfd8164..386472f41b 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java @@ -16,15 +16,6 @@ package org.springframework.integration.http.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; -import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.List; @@ -82,6 +73,15 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.DispatcherServlet; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; +import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + /** * @author Artem Bilan * @author Shiliang Li diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java index c628198f64..9ead55d1fe 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,6 +30,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerInterceptor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -84,11 +84,11 @@ public class CrossOriginTests { HandlerExecutionChain chain = this.handlerMapping.getHandler(this.request); CorsConfiguration config = getCorsConfiguration(chain, false); assertThat(config).isNotNull(); - assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "GET" }); + assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"}); assertThat(config.getAllowedOrigins()).isNull(); - assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowCredentials()).isTrue(); - assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getExposedHeaders()).isEmpty(); assertThat(config.getMaxAge()).isEqualTo(1800L); } @@ -99,11 +99,11 @@ public class CrossOriginTests { HandlerExecutionChain chain = this.handlerMapping.getHandler(this.request); CorsConfiguration config = getCorsConfiguration(chain, false); assertThat(config).isNotNull(); - assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "DELETE" }); + assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"DELETE"}); assertThat(config.getAllowedOrigins().toArray()) - .isEqualTo(new String[] { "https://site1.com", "https://site2.com" }); - assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "header1", "header2" }); - assertThat(config.getExposedHeaders().toArray()).isEqualTo(new String[] { "header3", "header4" }); + .isEqualTo(new String[] {"https://site1.com", "https://site2.com"}); + assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"header1", "header2"}); + assertThat(config.getExposedHeaders().toArray()).isEqualTo(new String[] {"header3", "header4"}); assertThat(config.getMaxAge()).isEqualTo(123L); assertThat(config.getAllowCredentials()).isEqualTo(false); } @@ -116,11 +116,11 @@ public class CrossOriginTests { HandlerExecutionChain chain = this.handlerMapping.getHandler(this.request); CorsConfiguration config = getCorsConfiguration(chain, true); assertThat(config).isNotNull(); - assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "GET" }); + assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"GET"}); assertThat(config.getAllowedOrigins()).isNull(); - assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowCredentials()).isTrue(); - assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getExposedHeaders()).isEmpty(); assertThat(config.getMaxAge()).isEqualTo(1800L); } @@ -134,10 +134,10 @@ public class CrossOriginTests { HandlerExecutionChain chain = this.handlerMapping.getHandler(this.request); CorsConfiguration config = getCorsConfiguration(chain, true); assertThat(config).isNotNull(); - assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowedOrigins()).isNull(); - assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] { "*" }); - assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] {"*"}); + assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowCredentials()).isTrue(); assertThat(config.getExposedHeaders()).isNull(); assertThat(config.getMaxAge()).isNull(); @@ -151,10 +151,10 @@ public class CrossOriginTests { HandlerExecutionChain chain = this.handlerMapping.getHandler(this.request); CorsConfiguration config = getCorsConfiguration(chain, true); assertThat(config).isNotNull(); - assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedMethods().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowedOrigins()).isNull(); - assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] { "*" }); - assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] { "*" }); + assertThat(config.getAllowedOriginPatterns().toArray()).isEqualTo(new String[] {"*"}); + assertThat(config.getAllowedHeaders().toArray()).isEqualTo(new String[] {"*"}); assertThat(config.getAllowCredentials()).isTrue(); assertThat(config.getExposedHeaders()).isNull(); assertThat(config.getMaxAge()).isNull(); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java index 7cd728694e..5611a5b576 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -26,7 +23,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import jakarta.servlet.http.Cookie; - import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; @@ -47,6 +43,9 @@ import org.springframework.validation.ObjectError; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell @@ -426,5 +425,4 @@ public class HttpRequestHandlingControllerTests extends AbstractHttpInboundTests assertThat(modelAndView.getModelMap()).containsEntry("cookiesReply", "first"); } - } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java index 455798f676..ee3b1167ad 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.io.IOException; import java.io.PrintWriter; import java.io.Serializable; @@ -29,8 +24,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; @@ -62,7 +57,10 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.SerializationUtils; import org.springframework.web.multipart.MultipartResolver; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; /** * @author Mark Fisher @@ -297,7 +295,7 @@ public class HttpRequestHandlingMessagingGatewayTests extends AbstractHttpInboun TestBean testBean = new TestBean(); testBean.setName("T. Bean"); testBean.setAge(42); - request.setContent(new ObjectMapper().writeValueAsBytes(new TestBean[] { testBean })); + request.setContent(new ObjectMapper().writeValueAsBytes(new TestBean[] {testBean})); MockHttpServletResponse response = new MockHttpServletResponse(); gateway.handleRequest(request, response); byte[] bytes = response.getContentAsByteArray(); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java index 5efabd1f20..60ae5d10ba 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -37,6 +34,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.util.AntPathMatcher; import org.springframework.web.servlet.HandlerMapping; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java index e110e1f7f0..c15f041d43 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/Int2312RequestMappingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,11 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import jakarta.servlet.http.Cookie; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +42,9 @@ import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java index 8d5a992899..d4a63dc79e 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/MultipartAsRawByteArrayTests.java @@ -16,18 +16,12 @@ package org.springframework.integration.http.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Collections; import java.util.Enumeration; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; @@ -37,6 +31,11 @@ import org.springframework.messaging.Message; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java index 77dbe9d74a..5571636937 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.http.management; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,6 +47,13 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + /** * @author Artem Bilan * @author Gary Russell @@ -78,8 +78,8 @@ public class IntegrationGraphControllerTests { @Test public void testIntegrationGraphGet() throws Exception { this.mockMvc.perform(get("/testIntegration") - .header(HttpHeaders.ORIGIN, "https://foo.bar.com") - .accept(MediaType.APPLICATION_JSON)) + .header(HttpHeaders.ORIGIN, "https://foo.bar.com") + .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) .andExpect(handler().handlerType(IntegrationGraphController.class)) diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java index 1fe6dba5da..5dd2b2a8b9 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.http.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Gunnar Hillert diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index 42d8835bbc..992c7cbec7 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.http.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.Serializable; @@ -37,6 +31,8 @@ import java.util.concurrent.atomic.AtomicReference; import javax.xml.transform.Source; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; @@ -73,8 +69,11 @@ import org.springframework.web.client.RestClientException; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.DefaultUriBuilderFactory; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Mark Fisher @@ -204,9 +203,9 @@ public class HttpRequestExecutingMessageHandlerTests { setBeanFactory(handler); handler.afterPropertiesSet(); Map form = new LinkedHashMap<>(); - form.put("a", new String[]{ "1", "2", "3" }); + form.put("a", new String[] {"1", "2", "3"}); form.put("b", "4"); - form.put("c", new String[]{ "5" }); + form.put("c", new String[] {"5"}); form.put("d", "6"); Message message = MessageBuilder.withPayload(form).build(); @@ -249,9 +248,9 @@ public class HttpRequestExecutingMessageHandlerTests { setBeanFactory(handler); handler.afterPropertiesSet(); Map form = new LinkedHashMap<>(); - form.put("a", new int[]{ 1, 2, 3 }); + form.put("a", new int[] {1, 2, 3}); form.put("b", "4"); - form.put("c", new String[]{ "5" }); + form.put("c", new String[] {"5"}); form.put("d", "6"); Message message = MessageBuilder.withPayload(form).build(); @@ -297,7 +296,7 @@ public class HttpRequestExecutingMessageHandlerTests { setBeanFactory(handler); handler.afterPropertiesSet(); Map form = new LinkedHashMap<>(); - form.put("a", new Object[]{ null, 4, null }); + form.put("a", new Object[] {null, 4, null}); form.put("b", "4"); Message message = MessageBuilder.withPayload(form).build(); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java index d609a25f5a..4a74715cf5 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.http.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.net.URI; import java.util.Collections; import java.util.HashMap; @@ -40,6 +36,10 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index cf1d7b3457..968524886a 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.http.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; @@ -44,6 +42,8 @@ import org.springframework.http.MediaType; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher @@ -108,7 +108,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateAllowAsStringArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Allow", new String[] { "GET", "POST" }); + messageHeaders.put("Allow", new String[] {"GET", "POST"}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -121,7 +121,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateAllowAsHttpMethodArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Allow", new HttpMethod[] { HttpMethod.GET, HttpMethod.POST }); + messageHeaders.put("Allow", new HttpMethod[] {HttpMethod.GET, HttpMethod.POST}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java index cc3dd6a21b..b01b8cf712 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.http.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.text.ParseException; @@ -43,6 +41,8 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.util.MimeType; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher @@ -108,7 +108,7 @@ public class DefaultHttpHeaderMapperFromMessageOutboundTests { public void validateAcceptHeaderMultipleAsStringArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.outboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Accept", new String[] { "bar/foo", "text/xml" }); + messageHeaders.put("Accept", new String[] {"bar/foo", "text/xml"}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -209,7 +209,7 @@ public class DefaultHttpHeaderMapperFromMessageOutboundTests { public void validateAcceptCharsetHeaderMultipleAsStringArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.outboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Accept-Charset", new String[] { "UTF-8", "ISO-8859-1" }); + messageHeaders.put("Accept-Charset", new String[] {"UTF-8", "ISO-8859-1"}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -223,7 +223,7 @@ public class DefaultHttpHeaderMapperFromMessageOutboundTests { public void validateAcceptCharsetHeaderMultipleAsCharsetArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.outboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("Accept-Charset", new Charset[] { Charset.forName("UTF-8"), Charset.forName("ISO-8859-1") }); + messageHeaders.put("Accept-Charset", new Charset[] {Charset.forName("UTF-8"), Charset.forName("ISO-8859-1")}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); @@ -472,7 +472,7 @@ public class DefaultHttpHeaderMapperFromMessageOutboundTests { public void validateIfNoneMatchAsStringArray() { HeaderMapper mapper = DefaultHttpHeaderMapper.outboundMapper(); Map messageHeaders = new HashMap<>(); - messageHeaders.put("If-None-Match", new String[] { "\"1234567\"", "\"123\"" }); + messageHeaders.put("If-None-Match", new String[] {"\"1234567\"", "\"123\""}); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java index 7e98fa4e74..839f9d0bfd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolReceivingChannelAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -170,11 +170,11 @@ public abstract class AbstractInternetProtocolReceivingChannelAdapter this.taskExecutor = Executors.newFixedThreadPool(this.poolSize, (runner) -> { - Thread thread = new Thread(runner); - thread.setName(threadName); - thread.setDaemon(true); - return thread; - }); + Thread thread = new Thread(runner); + thread.setName(threadName); + thread.setDaemon(true); + return thread; + }); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java index 70bfd18edc..ef5ff630dd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/AbstractInternetProtocolSendingMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -143,5 +143,4 @@ public abstract class AbstractInternetProtocolSendingMessageHandler extends Abst return this.running; } - } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java index 6ec6709226..e1f6070189 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/CommonSocketOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2021 the original author or authors. + * Copyright 2001-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public interface CommonSocketOptions { * adapters, specifies which interface to which the acknowledgment socket will be bound. Does not * apply to TCP outbound adapters and gateways. * - * @param localAddress The local address. + * @param localAddress The local address. */ void setLocalAddress(String localAddress); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java index 5ac6279cf7..2175f7b4df 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,6 +97,7 @@ public final class IpHeaders { */ public static final String REMOTE_PORT = TCP_PREFIX + "remotePort"; - private IpHeaders() { } + private IpHeaders() { + } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java index 1c89844511..7345885b8e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,7 +78,7 @@ public class TcpConnectionFactoryFactoryBean extends AbstractFactoryBean getObjectType() { return this.connectionFactory != null ? this.connectionFactory.getClass() : - this.type == null ? AbstractConnectionFactory.class : - isServer() ? AbstractServerConnectionFactory.class : - isClient() ? AbstractClientConnectionFactory.class : - AbstractConnectionFactory.class; + this.type == null ? AbstractConnectionFactory.class : + isServer() ? AbstractServerConnectionFactory.class : + isClient() ? AbstractClientConnectionFactory.class : + AbstractConnectionFactory.class; } @Override diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java index 58f7c50a00..50d271211b 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpConnectionFactoryParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,5 +106,4 @@ public class TcpConnectionFactoryParser extends AbstractBeanDefinitionParser { return builder.getBeanDefinition(); } - } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java index 4b3c6b14be..d12c3bfa3a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/TcpOutboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,5 +45,4 @@ public class TcpOutboundChannelAdapterParser extends AbstractOutboundChannelAdap return builder.getBeanDefinition(); } - } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java index 4f1637016f..285eb66c61 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/UdpInboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,8 +75,8 @@ public class UdpInboundChannelAdapterParser extends AbstractChannelAdapterParser if (!StringUtils.hasText(mcAddress)) { parserContext.getReaderContext().error( IpAdapterParserUtils.MULTICAST_ADDRESS - + " is required for a multicast UDP/IP channel adapter", - element); + + " is required for a multicast UDP/IP channel adapter", + element); } builder.addConstructorArgValue(mcAddress); } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java index 788adcf0bb..b1146a3276 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/AbstractConnectionFactorySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.integration.ip.tcp.connection.TcpSocketSupport; * */ public abstract class AbstractConnectionFactorySpec - , C extends AbstractConnectionFactory> + , C extends AbstractConnectionFactory> extends IntegrationComponentSpec { protected AbstractConnectionFactorySpec(C connectionFactory) { diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ConnectionFactory.java index eb9689d071..2518ced128 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2020 the original author or authors. + * Copyright 2001-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.integration.ip.tcp.connection; import org.springframework.integration.support.management.ManageableLifecycle; - /** * A factory used to create TcpConnection objects. * diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedCorrelationEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedCorrelationEvent.java index fd2ff4d4a4..a839c019ad 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedCorrelationEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedCorrelationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import org.springframework.integration.ip.event.IpIntegrationEvent; import org.springframework.messaging.MessagingException; - /** * An event emitted when an endpoint cannot correlate a connection id to a * connection; the cause is a messaging exception with the failed message. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedEvent.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedEvent.java index 109934c1a0..ed4885058e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedEvent.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionFailedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package org.springframework.integration.ip.tcp.connection; import org.springframework.integration.ip.event.IpIntegrationEvent; - /** * An event emitted when a connection could not be established for some * reason. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java index b97d3cdae9..97792b18cb 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetClientConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class TcpNetClientConnectionFactory extends setSocketAttributes(socket); TcpConnectionSupport connection = this.tcpNetConnectionSupport.createNewConnection(socket, false, isLookupHost(), - getApplicationEventPublisher(), getComponentName()); + getApplicationEventPublisher(), getComponentName()); TcpConnectionSupport wrapped = wrapConnection(connection); if (!wrapped.equals(connection)) { connection.setSenders(getSenders()); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java index 86def19d3e..ac927add90 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,7 +162,7 @@ public class TcpNioSSLConnection extends TcpNioConnection { case NEED_UNWRAP: case FINISHED: case NOT_HANDSHAKING: - result = checkBytesProduced(networkBuffer); + result = checkBytesProduced(networkBuffer); break; case NEED_WRAP: result = needWrap(networkBuffer, result); diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpCodecs.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpCodecs.java index 059ec00195..f957420582 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpCodecs.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/TcpCodecs.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -137,14 +137,14 @@ public final class TcpCodecs { */ public static ByteArrayLengthHeaderSerializer lengthHeader(int bytes) { switch (bytes) { - case ByteArrayLengthHeaderSerializer.HEADER_SIZE_UNSIGNED_BYTE: - return lengthHeader1(); - case ByteArrayLengthHeaderSerializer.HEADER_SIZE_UNSIGNED_SHORT: - return lengthHeader2(); - case ByteArrayLengthHeaderSerializer.HEADER_SIZE_INT: - return lengthHeader4(); - default: - throw new IllegalArgumentException("Only 1, 2 or 4 byte headers are supported"); + case ByteArrayLengthHeaderSerializer.HEADER_SIZE_UNSIGNED_BYTE: + return lengthHeader1(); + case ByteArrayLengthHeaderSerializer.HEADER_SIZE_UNSIGNED_SHORT: + return lengthHeader2(); + case ByteArrayLengthHeaderSerializer.HEADER_SIZE_INT: + return lengthHeader4(); + default: + throw new IllegalArgumentException("Only 1, 2 or 4 byte headers are supported"); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java index 647ac15ddf..1f045c7e70 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java @@ -59,7 +59,8 @@ public class UnicastReceivingChannelAdapter extends AbstractInternetProtocolRece private int soSendBufferSize = -1; - private SocketCustomizer socketCustomizer = (aSocket) -> { }; + private SocketCustomizer socketCustomizer = (aSocket) -> { + }; /** * Constructs a UnicastReceivingChannelAdapter that listens on the specified port. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java index d3e396669a..a5a8c40aa9 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java @@ -101,7 +101,8 @@ public class UnicastSendingMessageHandler extends private EvaluationContext evaluationContext; - private SocketCustomizer socketCustomizer = (aSocket) -> { }; + private SocketCustomizer socketCustomizer = (aSocket) -> { + }; private volatile CountDownLatch ackLatch; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index 066dc2623c..1428884114 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.ip.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - import java.net.DatagramSocket; import java.time.Duration; import java.util.Iterator; @@ -79,6 +75,10 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Oleg Zhurakousky diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBeanTest.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBeanTest.java index 84dd4e878d..9e319836fc 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBeanTest.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/TcpConnectionFactoryFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.ip.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -42,7 +42,6 @@ public class TcpConnectionFactoryFactoryBeanTest { } - @Test public void testReadDelay() throws Exception { TcpConnectionFactoryFactoryBean fb = new TcpConnectionFactoryFactoryBean(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/ConnectionFacforyTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/ConnectionFacforyTests.java index bd370a291f..3525d40d22 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/ConnectionFacforyTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/ConnectionFacforyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -36,6 +34,8 @@ import org.springframework.integration.transformer.ObjectToStringTransformer; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Tim Ysewyn @@ -46,7 +46,8 @@ public class ConnectionFacforyTests { @Test public void test() throws Exception { - ApplicationEventPublisher publisher = e -> { }; + ApplicationEventPublisher publisher = e -> { + }; AbstractServerConnectionFactory server = Tcp.netServer(0).backlog(2).soTimeout(5000).get(); final AtomicReference> received = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch(1); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java index 7c57bd4c41..6622bfe0b5 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/IpIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.ip.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -66,6 +64,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan @@ -124,7 +124,8 @@ public class IpIntegrationTests { @Test void testTcpAdapters() { - ApplicationEventPublisher publisher = e -> { }; + ApplicationEventPublisher publisher = e -> { + }; AbstractServerConnectionFactory server = Tcp.netServer(0).backlog(2).soTimeout(5000).id("server").get(); assertThat(server.getComponentName()).isEqualTo("server"); server.setApplicationEventPublisher(publisher); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AbstractTcpChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AbstractTcpChannelAdapterTests.java index a499df9431..7932e5568d 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AbstractTcpChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AbstractTcpChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,8 @@ import org.springframework.integration.ip.tcp.connection.HelloWorldInterceptorFa */ public class AbstractTcpChannelAdapterTests { - private static final ApplicationEventPublisher NOOP_PUBLISHER = event -> { }; + private static final ApplicationEventPublisher NOOP_PUBLISHER = event -> { + }; protected HelloWorldInterceptorFactory newInterceptorFactory() { return newInterceptorFactory(NOOP_PUBLISHER); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AutoStartTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AutoStartTests.java index 02b3f4e9ff..5f2b9ffef5 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AutoStartTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/AutoStartTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.1 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests.java index b484d9aafe..1b060eed08 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import org.junit.Before; @@ -35,6 +32,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * @author Gary Russell * @since 2.1 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java index ca668b07af..d9a7d97240 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import org.junit.FixMethodOrder; @@ -47,6 +45,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java index 703e141eef..f3ae9e2be2 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -41,6 +39,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java index d13702c6c8..67e735f7a0 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import org.junit.Test; @@ -39,6 +37,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java index 6d7812c7d4..04aad4a827 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigInboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -36,6 +34,8 @@ import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java index 7e857e963b..f59777d7c8 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Map; import org.junit.Before; @@ -41,6 +38,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan @@ -133,37 +133,37 @@ public class TcpConfigOutboundGatewayTests { servers.forEach((k, v) -> { TestingUtilities.waitListening(v, null); switch (k) { - case "crLfServer": - this.crLfClient.setPort(v.getPort()); - break; - case "crLfServer2": - this.ctx.getBean("crLfClient2", AbstractClientConnectionFactory.class).setPort(v.getPort()); - break; - case "crLfServerNio": - this.ctx.getBean("crLfClientNio", AbstractClientConnectionFactory.class).setPort(v.getPort()); - break; - case "stxEtxServer": - this.stxEtxClient.setPort(v.getPort()); - break; - case "stxEtxServerNio": - this.ctx.getBean("stxEtxClientNio", AbstractClientConnectionFactory.class).setPort(v.getPort()); - break; - case "lengthHeaderServer": - this.lengthHeaderClient.setPort(v.getPort()); - break; - case "lengthHeaderServerNio": - this.ctx.getBean("lengthHeaderClientNio", - AbstractClientConnectionFactory.class).setPort(v.getPort()); - break; - case "javaSerialServer": - this.javaSerialClient.setPort(v.getPort()); - break; - case "javaSerialServerNio": - this.ctx.getBean("javaSerialClientNio", - AbstractClientConnectionFactory.class).setPort(v.getPort()); - break; - default: - fail("Unexpected server:" + v); + case "crLfServer": + this.crLfClient.setPort(v.getPort()); + break; + case "crLfServer2": + this.ctx.getBean("crLfClient2", AbstractClientConnectionFactory.class).setPort(v.getPort()); + break; + case "crLfServerNio": + this.ctx.getBean("crLfClientNio", AbstractClientConnectionFactory.class).setPort(v.getPort()); + break; + case "stxEtxServer": + this.stxEtxClient.setPort(v.getPort()); + break; + case "stxEtxServerNio": + this.ctx.getBean("stxEtxClientNio", AbstractClientConnectionFactory.class).setPort(v.getPort()); + break; + case "lengthHeaderServer": + this.lengthHeaderClient.setPort(v.getPort()); + break; + case "lengthHeaderServerNio": + this.ctx.getBean("lengthHeaderClientNio", + AbstractClientConnectionFactory.class).setPort(v.getPort()); + break; + case "javaSerialServer": + this.javaSerialClient.setPort(v.getPort()); + break; + case "javaSerialServerNio": + this.ctx.getBean("javaSerialClientNio", + AbstractClientConnectionFactory.class).setPort(v.getPort()); + break; + default: + fail("Unexpected server:" + v); } }); Map consumers = diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java index 2e2b5becf2..0b25cc4cdd 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.io.InputStream; import java.net.ServerSocket; @@ -61,6 +58,9 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java index 950cc032b7..a011e01112 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.catchThrowable; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.EOFException; import java.io.IOException; import java.io.InputStream; @@ -88,6 +79,15 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -858,7 +858,8 @@ public class TcpOutboundGatewayTests { final int port = server.getLocalPort(); TcpOutboundGateway gateway = new TcpOutboundGateway(); TcpNioClientConnectionFactory cf = new TcpNioClientConnectionFactory("localhost", port); - cf.setApplicationEventPublisher(e -> { }); + cf.setApplicationEventPublisher(e -> { + }); gateway.setConnectionFactory(cf); final AtomicBoolean done = new AtomicBoolean(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java index cb8e5326f4..106fe3774a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -60,6 +57,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.SubscribableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -655,5 +655,4 @@ public class TcpReceivingChannelAdapterTests extends AbstractTcpChannelAdapterTe } } - } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java index 0cc50c51c4..c553b7204c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -80,6 +75,11 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell @@ -1019,7 +1019,7 @@ public class TcpSendingMessageHandlerTests extends AbstractTcpChannelAdapterTest ccf.setDeserializer(new DefaultDeserializer()); ccf.setSoTimeout(10000); TcpConnectionInterceptorFactoryChain fc = new TcpConnectionInterceptorFactoryChain(); - fc.setInterceptors(new TcpConnectionInterceptorFactory[] { newInterceptorFactory() }); + fc.setInterceptors(new TcpConnectionInterceptorFactory[] {newInterceptorFactory()}); ccf.setInterceptorFactoryChain(fc); ccf.start(); TcpSendingMessageHandler handler = new TcpSendingMessageHandler(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java index 6327f618de..8f2c7c96f5 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.junit.runner.RunWith; @@ -30,6 +27,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java index 4c4cfb65fa..b339edafe9 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.awaitility.Awaitility.await; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; @@ -85,6 +71,20 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java index 4c702c1c75..1cad6d9149 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java @@ -16,17 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.io.OutputStream; import java.io.UncheckedIOException; import java.net.BindException; @@ -64,6 +53,17 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java index 9e4b754368..f54693d56b 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -27,6 +25,8 @@ import org.junit.Test; import org.springframework.messaging.MessagingException; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java index 36f3dfc565..b94a5c71f8 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java @@ -16,19 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.Socket; @@ -73,6 +60,19 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -326,7 +326,8 @@ public class ConnectionFactoryTests { server.start(); assertThat(serverUp.await(10, TimeUnit.SECONDS)).isTrue(); TcpNetClientConnectionFactory clientFactory = new TcpNetClientConnectionFactory("localhost", server.getPort()); - clientFactory.setApplicationEventPublisher(event -> { }); + clientFactory.setApplicationEventPublisher(event -> { + }); clientFactory.setConnectionTest(conn -> { CountDownLatch latch = new CountDownLatch(1); AtomicBoolean result = new AtomicBoolean(); @@ -354,7 +355,7 @@ public class ConnectionFactoryTests { gateway.start(); if (fail) { assertThatExceptionOfType(MessagingException.class).isThrownBy(() -> - gateway.handleMessage(new GenericMessage<>("test1"))) + gateway.handleMessage(new GenericMessage<>("test1"))) .withStackTraceContaining("Connection test failed for"); } else { diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java index 5a9e2fd5a6..9ff83b783e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.Socket; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -35,6 +33,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.2 @@ -231,6 +231,7 @@ public class ConnectionTimeoutTests { public void addNewConnection(TcpConnection connection) { serverConnection.set(connection); } + @Override public void removeDeadConnection(TcpConnection connection) { } @@ -243,6 +244,7 @@ public class ConnectionTimeoutTests { @Override public void addNewConnection(TcpConnection connection) { } + @Override public void removeDeadConnection(TcpConnection connection) { } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java index 1b8d81268b..16c63f2129 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.when; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -69,6 +57,18 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -105,7 +105,7 @@ public class FailoverClientConnectionFactoryTests { when(factory1.isActive()).thenReturn(true); when(factory2.isActive()).thenReturn(true); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(conn1).send(Mockito.any(Message.class)); + .when(conn1).send(Mockito.any(Message.class)); doAnswer(invocation -> null).when(conn2).send(Mockito.any(Message.class)); FailoverClientConnectionFactory failoverFactory = new FailoverClientConnectionFactory(factories); failoverFactory.start(); @@ -140,7 +140,7 @@ public class FailoverClientConnectionFactoryTests { TcpConnectionSupport conn2 = makeMockConnection(); doReturn("conn2").when(conn2).getConnectionId(); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(factory1).getConnection(); + .when(factory1).getConnection(); if (closeOnRefresh) { when(factory2.getConnection()).thenReturn(conn1, conn2); } @@ -193,14 +193,14 @@ public class FailoverClientConnectionFactoryTests { when(factory1.isActive()).thenReturn(true); when(factory2.isActive()).thenReturn(true); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(conn1).send(Mockito.any(Message.class)); + .when(conn1).send(Mockito.any(Message.class)); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(conn2).send(Mockito.any(Message.class)); + .when(conn2).send(Mockito.any(Message.class)); FailoverClientConnectionFactory failoverFactory = new FailoverClientConnectionFactory(factories); failoverFactory.start(); GenericMessage message = new GenericMessage("foo"); assertThatExceptionOfType(UncheckedIOException.class).isThrownBy(() -> - failoverFactory.getConnection().send(message)); + failoverFactory.getConnection().send(message)); Mockito.verify(conn2).send(message); } @@ -227,7 +227,8 @@ public class FailoverClientConnectionFactoryTests { latch.countDown(); } }); - cf2.setApplicationEventPublisher(event -> { }); + cf2.setApplicationEventPublisher(event -> { + }); FailoverClientConnectionFactory fccf = new FailoverClientConnectionFactory(List.of(cf1, cf2)); fccf.registerListener(msf -> { latch.countDown(); @@ -262,7 +263,7 @@ public class FailoverClientConnectionFactoryTests { return null; }).when(conn1).send(Mockito.any(Message.class)); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(conn2).send(Mockito.any(Message.class)); + .when(conn2).send(Mockito.any(Message.class)); FailoverClientConnectionFactory failoverFactory = new FailoverClientConnectionFactory(factories); failoverFactory.start(); GenericMessage message = new GenericMessage("foo"); @@ -286,7 +287,7 @@ public class FailoverClientConnectionFactoryTests { failoverFactory.start(); GenericMessage message = new GenericMessage("foo"); assertThatExceptionOfType(UncheckedIOException.class).isThrownBy(() -> - failoverFactory.getConnection().send(message)); + failoverFactory.getConnection().send(message)); } @Test @@ -299,10 +300,10 @@ public class FailoverClientConnectionFactoryTests { TcpConnectionSupport conn1 = makeMockConnection(); doAnswer(invocation -> null).when(conn1).send(Mockito.any(Message.class)); when(factory1.getConnection()) - .thenThrow(new UncheckedIOException(new IOException("fail"))) - .thenReturn(conn1); + .thenThrow(new UncheckedIOException(new IOException("fail"))) + .thenReturn(conn1); when(factory2.getConnection()) - .thenThrow(new UncheckedIOException(new IOException("fail"))); + .thenThrow(new UncheckedIOException(new IOException("fail"))); when(factory1.isActive()).thenReturn(true); when(factory2.isActive()).thenReturn(true); FailoverClientConnectionFactory failoverFactory = new FailoverClientConnectionFactory(factories); @@ -333,12 +334,12 @@ public class FailoverClientConnectionFactoryTests { return null; }).when(conn1).send(Mockito.any(Message.class)); doThrow(new UncheckedIOException(new IOException("fail"))) - .when(conn2).send(Mockito.any(Message.class)); + .when(conn2).send(Mockito.any(Message.class)); FailoverClientConnectionFactory failoverFactory = new FailoverClientConnectionFactory(factories); failoverFactory.start(); GenericMessage message = new GenericMessage("foo"); assertThatExceptionOfType(UncheckedIOException.class) - .isThrownBy(() -> failoverFactory.getConnection().send(message)); + .isThrownBy(() -> failoverFactory.getConnection().send(message)); failoverFactory.getConnection().send(message); Mockito.verify(conn2).send(message); Mockito.verify(conn1, times(3)).send(message); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptorFactory.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptorFactory.java index 9f7d4d5345..e8b6323006 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptorFactory.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,5 +56,4 @@ public class HelloWorldInterceptorFactory implements return new HelloWorldInterceptor(this.hello, this.world, this.applicationEventPublisher); } - } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/PushbackTcpTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/PushbackTcpTests.java index 1b6655b9e8..fd2aa65f33 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/PushbackTcpTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/PushbackTcpTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; @@ -47,6 +44,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * @author Gary Russell * @since 5.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests.java index d206700fbc..9fb8db552a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SOLingerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.IOException; import java.io.InputStream; import java.net.Socket; @@ -35,6 +32,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 2.0.2 @@ -64,7 +64,8 @@ public class SOLingerTests { private AbstractServerConnectionFactory inCFNioLinger; @Test - public void configOk() { } + public void configOk() { + } @Test public void finReceivedNet() { @@ -159,6 +160,7 @@ public class SOLingerTests { } } + private void readFully(InputStream is, byte[] buff) throws IOException { for (int i = 0; i < buff.length; i++) { buff[i] = (byte) is.read(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java index 0535647fdf..19584bd148 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java @@ -16,17 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.InputStream; import java.io.UncheckedIOException; import java.net.InetAddress; @@ -60,6 +49,17 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java index 97e64c86a9..5830e74f18 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - import org.junit.Test; import org.mockito.Mockito; @@ -31,6 +27,10 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java index fbe67a6b67..2a78943ff5 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.net.InetAddress; @@ -51,6 +47,10 @@ import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.converter.MessageConverter; import org.springframework.util.MimeType; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionSupportTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionSupportTests.java index 75c1a67653..efc20699c9 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionSupportTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.Socket; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -31,6 +29,8 @@ import org.junit.Test; import org.springframework.context.ApplicationEventPublisher; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0.3 @@ -65,8 +65,8 @@ public class TcpNetConnectionSupportTests { CountDownLatch latch2 = new CountDownLatch(1); server.setApplicationEventPublisher(e -> { if (e instanceof TcpConnectionServerListeningEvent) { - latch2.countDown(); - } + latch2.countDown(); + } }); server.afterPropertiesSet(); server.start(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java index 1c2d95bb5d..941243f634 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -54,6 +47,13 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -69,7 +69,8 @@ public class TcpNetConnectionTests { InputStream stream = mock(InputStream.class); when(socket.getInputStream()).thenReturn(stream); when(stream.read()).thenReturn((int) 'x'); - TcpNetConnection connection = new TcpNetConnection(socket, true, false, e -> { }, null); + TcpNetConnection connection = new TcpNetConnection(socket, true, false, e -> { + }, null); connection.setDeserializer(new ByteArrayStxEtxSerializer()); final AtomicReference log = new AtomicReference(); Log logger = mock(Log.class); @@ -94,10 +95,11 @@ public class TcpNetConnectionTests { SocketChannel socketChannel = mock(SocketChannel.class); Socket socket = mock(Socket.class); when(socketChannel.socket()).thenReturn(socket); - TcpNioConnection connection = new TcpNioConnection(socketChannel, true, false, e -> { }, null); + TcpNioConnection connection = new TcpNioConnection(socketChannel, true, false, e -> { + }, null); ChannelInputStream inputStream = TestUtils.getPropertyValue(connection, "channelInputStream", ChannelInputStream.class); - inputStream.write(ByteBuffer.wrap(new byte[] { (byte) 0x80 })); + inputStream.write(ByteBuffer.wrap(new byte[] {(byte) 0x80})); assertThat(inputStream.read()).isEqualTo(0x80); } @@ -107,7 +109,8 @@ public class TcpNetConnectionTests { PipedInputStream pipe = new PipedInputStream(); when(inSocket.getInputStream()).thenReturn(pipe); - TcpConnectionSupport inboundConnection = new TcpNetConnection(inSocket, true, false, e -> { }, null); + TcpConnectionSupport inboundConnection = new TcpNetConnection(inSocket, true, false, e -> { + }, null); inboundConnection.setDeserializer(new MapJsonSerializer()); MapMessageConverter inConverter = new MapMessageConverter(); MessageConvertingTcpMessageMapper inMapper = new MessageConvertingTcpMessageMapper(inConverter); @@ -115,7 +118,8 @@ public class TcpNetConnectionTests { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Socket outSocket = mock(Socket.class); - TcpNetConnection outboundConnection = new TcpNetConnection(outSocket, true, false, e -> { }, null); + TcpNetConnection outboundConnection = new TcpNetConnection(outSocket, true, false, e -> { + }, null); when(outSocket.getOutputStream()).thenReturn(baos); MapMessageConverter outConverter = new MapMessageConverter(); @@ -168,7 +172,7 @@ public class TcpNetConnectionTests { TcpNetConnection connection = new TcpNetConnection(socket, false, false, publisher, "socketClosedNextRead"); socket.close(); assertThatThrownBy(() -> connection.getPayload()) - .isInstanceOf(SoftEndOfStreamException.class); + .isInstanceOf(SoftEndOfStreamException.class); server.stop(); } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java index 7fc9613c35..346af4f21c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.with; - import java.net.InetAddress; import java.net.Socket; import java.time.Duration; @@ -43,6 +40,9 @@ import org.springframework.integration.test.condition.LogLevels; import org.springframework.messaging.Message; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.with; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java index 4a996c2fa4..183bc640f0 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java @@ -16,19 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; -import static org.awaitility.Awaitility.with; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.contains; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -93,6 +80,19 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.with; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.contains; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionWriteTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionWriteTests.java index 45f8e81afa..7ad7d37bda 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionWriteTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionWriteTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; import java.net.ServerSocket; @@ -36,6 +34,8 @@ import org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSe import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer; import org.springframework.integration.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpSenderTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpSenderTests.java index cec458aba9..980a672952 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpSenderTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpSenderTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -28,6 +26,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.3.10 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactoryTests.java index 574ef4dbc2..57e3838543 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ThreadAffinityClientConnectionFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.connection; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Collections; @@ -40,6 +37,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * @author Gary Russell * @since 5.0 @@ -219,5 +219,4 @@ public class ThreadAffinityClientConnectionFactoryTests { } - } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java index b6365f4b35..1925c3202f 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -54,6 +50,10 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Gavin Gray @@ -308,19 +308,19 @@ public class DeserializationTests { doDeserialize(new ByteArrayCrLfSerializer(), "CRLF not found before max message length: 5"); doDeserialize(new ByteArrayLengthHeaderSerializer(), "Message length 1718579042 exceeds max message length: 5"); TcpDeserializationExceptionEvent event = doDeserialize(new ByteArrayLengthHeaderSerializer(), - "Stream closed after 3 of 4", new byte[] { 0, 0, 0 }, 5); // closed during header read + "Stream closed after 3 of 4", new byte[] {0, 0, 0}, 5); // closed during header read assertThat(event.getOffset()).isEqualTo(-1); - assertThat(new String(event.getBuffer()).substring(0, 3)).isEqualTo(new String(new byte[] { 0, 0, 0 })); + assertThat(new String(event.getBuffer()).substring(0, 3)).isEqualTo(new String(new byte[] {0, 0, 0})); event = doDeserialize(new ByteArrayLengthHeaderSerializer(), - "Stream closed after 1 of 2", new byte[] { 0, 0, 0, 2, 7 }, 5); // closed during data read + "Stream closed after 1 of 2", new byte[] {0, 0, 0, 2, 7}, 5); // closed during data read assertThat(event.getOffset()).isEqualTo(-1); - assertThat(new String(event.getBuffer()).substring(0, 1)).isEqualTo(new String(new byte[] { 7 })); + assertThat(new String(event.getBuffer()).substring(0, 1)).isEqualTo(new String(new byte[] {7})); doDeserialize(new ByteArrayLfSerializer(), "Terminator '0xa' not found before max message length: 5"); doDeserialize(new ByteArrayRawSerializer(), "Socket was not closed before max message length: 5"); doDeserialize(new ByteArraySingleTerminatorSerializer((byte) 0xfe), "Terminator '0xfe' not found before max message length: 5"); doDeserialize(new ByteArrayStxEtxSerializer(), "Expected STX to begin message"); event = doDeserialize(new ByteArrayStxEtxSerializer(), - "Socket closed during message assembly", new byte[] { 0x02, 0, 0 }, 5); + "Socket closed during message assembly", new byte[] {0x02, 0, 0}, 5); assertThat(event.getOffset()).isEqualTo(2); } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LengthHeaderSerializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LengthHeaderSerializationTests.java index 4ad758d73f..56fc32a1cb 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LengthHeaderSerializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/LengthHeaderSerializationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,6 +24,8 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; /** @@ -39,7 +38,9 @@ import org.junit.Test; public class LengthHeaderSerializationTests { private static final String TEST = "Test"; + private String test255; + private String testFFFF; @Before diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/MapJsonSerializerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/MapJsonSerializerTests.java index e73bf10b41..88b40522c4 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/MapJsonSerializerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/MapJsonSerializerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.util.Map; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 3.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/PooledDeserializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/PooledDeserializationTests.java index 53545b6d33..77abc62e23 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/PooledDeserializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/PooledDeserializationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Set; @@ -27,6 +24,9 @@ import org.junit.Test; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 4.3 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java index e8592c7961..b0d454e438 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -34,6 +32,8 @@ import org.junit.Test; import org.springframework.core.serializer.DefaultSerializer; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/TcpCodecsTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/TcpCodecsTests.java index 54f410b68e..ce1def1e66 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/TcpCodecsTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/TcpCodecsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.ip.tcp.serializer; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0 diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java index b81201fee5..a991b1ea93 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.net.DatagramPacket; import java.net.InetSocketAddress; import java.nio.ByteBuffer; @@ -30,6 +27,9 @@ import org.springframework.integration.mapping.MessageMappingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Dave Syer diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMulticastSendingHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMulticastSendingHandlerTests.java index 17ab13f2fd..28b29627c5 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMulticastSendingHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMulticastSendingHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetAddress; @@ -40,6 +37,9 @@ import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java index 35267d3c00..3465afbde7 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; - import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetSocketAddress; @@ -36,6 +32,10 @@ import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java index 486e58e71e..af67ac5e0b 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Ignore; @@ -28,6 +26,8 @@ import org.springframework.integration.ip.util.SocketTestUtils; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @@ -52,7 +52,7 @@ public class MultiClientTests { public void testNoAck() throws Exception { final String payload = largePayload(1000); final UnicastReceivingChannelAdapter adapter = - new UnicastReceivingChannelAdapter(0); + new UnicastReceivingChannelAdapter(0); int drivers = 10; adapter.setPoolSize(drivers); QueueChannel queue = new QueueChannel(drivers * 3); @@ -98,7 +98,7 @@ public class MultiClientTests { public void testAck() throws Exception { final String payload = largePayload(1000); final UnicastReceivingChannelAdapter adapter = - new UnicastReceivingChannelAdapter(0, false); + new UnicastReceivingChannelAdapter(0, false); int drivers = 5; adapter.setPoolSize(drivers); QueueChannel queue = new QueueChannel(drivers * 3); @@ -146,7 +146,7 @@ public class MultiClientTests { public void testAckWithLength() throws Exception { final String payload = largePayload(1000); final UnicastReceivingChannelAdapter adapter = - new UnicastReceivingChannelAdapter(0, true); + new UnicastReceivingChannelAdapter(0, true); int drivers = 10; adapter.setPoolSize(drivers); QueueChannel queue = new QueueChannel(drivers * 3); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java index c7b8bc244c..632471eb8e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -51,6 +47,10 @@ import org.springframework.integration.test.rule.Log4j2LevelAdjuster; import org.springframework.messaging.Message; import org.springframework.messaging.SubscribableChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java index 988b448c6f..fe82b08330 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Date; import java.util.Properties; @@ -42,6 +38,10 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; + /** * Sends and receives a simple message through to the Udp channel adapters. * If run as a JUnit just sends one message and terminates (see console). diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java index 54d5e30109..09fcc92843 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ip.udp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Date; import java.util.Properties; @@ -43,6 +39,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.core.DestinationResolver; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.awaitility.Awaitility.await; + /** * Sends and receives a simple message through to the Udp channel adapters. * If run as a JUnit just sends one message and terminates (see console). diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java index b2821cfb36..7bc9d72f28 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package org.springframework.integration.ip.util; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell */ diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java index 0539b4018c..8008a545b2 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java @@ -16,8 +16,6 @@ package org.springframework.integration.ip.util; -import static org.awaitility.Awaitility.await; - import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; @@ -37,6 +35,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter; import org.springframework.lang.Nullable; +import static org.awaitility.Awaitility.await; + /** * TCP/IP Test utilities. * diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java index 7a36ff1513..a619f53ced 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -117,5 +117,4 @@ public class StoredProcOutboundGateway extends AbstractReplyProducingMessageHand return payload; } - } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java index b3e37aa7f7..d9cca09f44 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/JdbcNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,8 +35,8 @@ public class JdbcNamespaceHandler extends AbstractIntegrationNamespaceHandler { registerBeanDefinitionParser("outbound-gateway", new JdbcOutboundGatewayParser()); registerBeanDefinitionParser("message-store", new JdbcMessageStoreParser()); registerBeanDefinitionParser("stored-proc-outbound-channel-adapter", new StoredProcMessageHandlerParser()); - registerBeanDefinitionParser("stored-proc-inbound-channel-adapter", new StoredProcPollingChannelAdapterParser()); - registerBeanDefinitionParser("stored-proc-outbound-gateway", new StoredProcOutboundGatewayParser()); + registerBeanDefinitionParser("stored-proc-inbound-channel-adapter", new StoredProcPollingChannelAdapterParser()); + registerBeanDefinitionParser("stored-proc-outbound-gateway", new StoredProcOutboundGatewayParser()); } } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java index 736665cb58..6f179626eb 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java @@ -185,7 +185,7 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto * A converter for deserializing byte arrays to messages. * @param deserializer the deserializer to set */ - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void setDeserializer(Deserializer> deserializer) { this.deserializer = new AllowListDeserializingConverter((Deserializer) deserializer); } @@ -422,7 +422,7 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto public MessageGroup addMessageToGroup(Object groupId, final Message message) { try { this.jdbcTemplate.update(getQuery(Query.CREATE_MESSAGE, - () -> this.channelMessageStoreQueryProvider.getCreateMessageQuery()), + () -> this.channelMessageStoreQueryProvider.getCreateMessageQuery()), ps -> this.preparedStatementSetter.setValues(ps, message, groupId, this.region, this.priorityEnabled)); } @@ -590,8 +590,8 @@ public class JdbcChannelMessageStore implements PriorityCapableChannelMessageSto UUID id = messageToRemove.getHeaders().getId(); int updated = this.jdbcTemplate.update( getQuery(Query.DELETE_MESSAGE, () -> this.channelMessageStoreQueryProvider.getDeleteMessageQuery()), - new Object[]{ getKey(id), getKey(groupId), this.region }, - new int[]{ Types.VARCHAR, Types.VARCHAR, Types.VARCHAR }); + new Object[] {getKey(id), getKey(groupId), this.region}, + new int[] {Types.VARCHAR, Types.VARCHAR, Types.VARCHAR}); boolean result = updated != 0; if (result) { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java index 83229008b0..14dcca850c 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java @@ -249,7 +249,7 @@ public class JdbcMessageStore extends AbstractMessageGroupStore implements Messa * A converter for deserializing byte arrays to message. * @param deserializer the deserializer to set */ - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void setDeserializer(Deserializer> deserializer) { this.deserializer = new AllowListDeserializingConverter((Deserializer) deserializer); this.deserializerExplicitlySet = true; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/DerbyChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/DerbyChannelMessageStoreQueryProvider.java index bc8e6be97d..bf3a2df204 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/DerbyChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/DerbyChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ public class DerbyChannelMessageStoreQueryProvider extends AbstractChannelMessag private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getPollFromGroupExcludeIdsQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java index 542ae519ba..5025bbbf63 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +28,8 @@ public class H2ChannelMessageStoreQueryProvider extends AbstractChannelMessageSt private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getCreateMessageQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java index f0e0529a74..2a011255a7 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ public class HsqlChannelMessageStoreQueryProvider extends AbstractChannelMessage private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getCreateMessageQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MySqlChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MySqlChannelMessageStoreQueryProvider.java index a2afd5b946..13a5d2ac2b 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MySqlChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MySqlChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ public class MySqlChannelMessageStoreQueryProvider extends AbstractChannelMessag private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getPollFromGroupExcludeIdsQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java index d89dffdca5..5d78e6f716 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,8 +35,8 @@ public class OracleChannelMessageStoreQueryProvider extends AbstractChannelMessa private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getCreateMessageQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java index 8b36df8049..da7c375efe 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ public class PostgresChannelMessageStoreQueryProvider extends AbstractChannelMes private static final String SELECT_COMMON = "SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getPollFromGroupExcludeIdsQuery() { diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java index 1264c89e89..24263714c5 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ public class SqlServerChannelMessageStoreQueryProvider extends AbstractChannelMe private static final String SELECT_COMMON = "SELECT TOP 1 %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES " - + "from %PREFIX%CHANNEL_MESSAGE " - + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; + + "from %PREFIX%CHANNEL_MESSAGE " + + "where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region "; @Override public String getPollFromGroupExcludeIdsQuery() { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java index 4542212b0b..0b2b7fe761 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/AggregatorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -40,6 +38,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java index 1f2f7f0637..0a9538ba6f 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -49,6 +46,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactoryTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactoryTests.java index 4f9eb4b9c9..5c30f666d1 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactoryTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/ExpressionEvaluatingSqlParameterSourceFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.sql.Types; import java.util.Arrays; import java.util.Collections; @@ -29,6 +26,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.support.JdbcUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer * @author Meherzad Lahewala diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java index 3cf54804a1..f45eb75cc2 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.List; import java.util.Map; @@ -39,6 +36,9 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcOutboundGatewayTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcOutboundGatewayTests.java index aa991a1a9a..9b746fdbbe 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcOutboundGatewayTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcOutboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -29,6 +25,10 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * * @author Gunnar Hillert diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java index fea6b738e3..8112496151 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; @@ -39,6 +36,9 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Jonas Partner * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java index ac97b717be..6915510ebf 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -34,6 +32,8 @@ import org.springframework.integration.test.support.LongRunningIntegrationTest; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java index 9442d544cb..627c207159 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,6 +35,11 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SqlParameter; import org.springframework.jdbc.core.simple.SimpleJdbcCallOperations; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJavaConfigTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJavaConfigTests.java index a56685cf1b..8f2ad69f11 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJavaConfigTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJavaConfigTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.Types; import java.util.ArrayList; import java.util.Collection; @@ -50,6 +48,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * Equivalent to {@link StoredProcPollingChannelAdapterWithNamespaceIntegrationTests}. * diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcMessageHandlerDerbyIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcMessageHandlerDerbyIntegrationTests.java index 3831addb3f..810c3d3e01 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcMessageHandlerDerbyIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcMessageHandlerDerbyIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -41,6 +38,9 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java index e83c64ade9..3a0c6a2aab 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java index cec5b9a9d9..472a2a31af 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -41,6 +39,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java index a8c7da7606..4180490d1b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.sql.CallableStatement; import java.util.Collection; import java.util.concurrent.BlockingQueue; @@ -52,6 +49,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java index f5412a304f..2e2af7ada2 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -37,6 +35,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java index 24144f22b5..4e6dff1e60 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java index bd1e922e6b..f3f3eeae99 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -35,6 +33,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java index 0a856dccb3..62f537d77b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -35,6 +33,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/channel/PostgresChannelMessageTableSubscriberTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/channel/PostgresChannelMessageTableSubscriberTests.java index 1fc5380b1c..68fc5ed955 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/channel/PostgresChannelMessageTableSubscriberTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/channel/PostgresChannelMessageTableSubscriberTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.DriverManager; import java.util.ArrayList; import java.util.List; @@ -45,6 +43,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Rafael Winterhalter * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/InnerPollerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/InnerPollerParserTests.java index a3b3d2af75..e9f728ec63 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/InnerPollerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/InnerPollerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; @@ -27,6 +24,9 @@ import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @since 2.0.5 @@ -45,28 +45,28 @@ public class InnerPollerParserTests { try { // Load context from a String to avoid IDEs reporting the invalid configuration String badContext = - "" + - "" + - "" + - " " + - "" + - " " + - "" + - " " + - " " + // <<<<< fixed-rate not allowed here - " " + - "" + - " " + - " " + - " " + - ""; + "" + + "" + + "" + + " " + + "" + + " " + + "" + + " " + + " " + // <<<<< fixed-rate not allowed here + " " + + "" + + " " + + " " + + " " + + ""; Resource resource = new ByteArrayResource(badContext.getBytes()); new GenericXmlApplicationContext(resource).close(); @@ -85,28 +85,28 @@ public class InnerPollerParserTests { try { // Load context from a String to avoid IDEs reporting the invalid configuration String badContext = - "" + - "" + - "" + - " " + - "" + - " " + - "" + - " " + - " " + // <<<<< default true not allowed here - " " + - "" + - " " + - " " + - " " + - ""; + "" + + "" + + "" + + " " + + "" + + " " + + "" + + " " + + " " + // <<<<< default true not allowed here + " " + + "" + + " " + + " " + + " " + + ""; Resource resource = new ByteArrayResource(badContext.getBytes()); new GenericXmlApplicationContext(resource).close(); @@ -124,28 +124,28 @@ public class InnerPollerParserTests { try { // Load context from a String to avoid IDEs reporting the invalid configuration String badContext = - "" + - "" + - "" + - " " + - "" + - " " + - "" + - " " + - " " + // <<<<< fixed-rate not allowed here - " " + - "" + - " " + - " " + - " " + - ""; + "" + + "" + + "" + + " " + + "" + + " " + + "" + + " " + + " " + // <<<<< fixed-rate not allowed here + " " + + "" + + " " + + " " + + " " + + ""; Resource resource = new ByteArrayResource(badContext.getBytes()); new GenericXmlApplicationContext(resource).close(); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java index 853495ee69..22f51391cb 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.List; import java.util.Map; @@ -38,6 +36,8 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java index f87beba5a7..cf4ca64767 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -38,6 +36,8 @@ import org.springframework.jdbc.support.lob.LobHandler; import org.springframework.messaging.Message; import org.springframework.test.util.ReflectionTestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Dave Syer diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java index a1e9fb35fe..3fadc1c1be 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Collections; @@ -49,6 +44,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Dave Syer * @author Oleg Zhurakousky diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java index 0249dab129..c7123a8479 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Map; import java.util.Properties; @@ -41,6 +39,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Syer * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcTypesEnumTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcTypesEnumTests.java index ec13a1f847..4444e7d423 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcTypesEnumTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcTypesEnumTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.sql.Types; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + public class JdbcTypesEnumTests { @Test diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java index 74d98af82c..518ede3d2e 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.util.Properties; @@ -32,6 +29,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @since 3.0 diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java index 3c490abc9f..a1f527c4bb 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.Types; import java.util.List; @@ -39,6 +37,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell @@ -82,7 +82,7 @@ public class StoredProcMessageHandlerParserTests { Object executor = accessor.getPropertyValue("executor"); DirectFieldAccessor executorAccessor = new DirectFieldAccessor(executor); - Object procedureParameters = executorAccessor.getPropertyValue("procedureParameters"); + Object procedureParameters = executorAccessor.getPropertyValue("procedureParameters"); assertThat(procedureParameters).isNotNull(); assertThat(procedureParameters instanceof List).isTrue(); @@ -124,7 +124,7 @@ public class StoredProcMessageHandlerParserTests { Object executor = accessor.getPropertyValue("executor"); DirectFieldAccessor executorAccessor = new DirectFieldAccessor(executor); - Object sqlParameters = executorAccessor.getPropertyValue("sqlParameters"); + Object sqlParameters = executorAccessor.getPropertyValue("sqlParameters"); assertThat(sqlParameters).isNotNull(); assertThat(sqlParameters instanceof List).isTrue(); @@ -177,8 +177,8 @@ public class StoredProcMessageHandlerParserTests { } public void setUp(String name, Class cls) { - context = new ClassPathXmlApplicationContext(name, cls); - consumer = this.context.getBean("storedProcedureOutboundChannelAdapter", EventDrivenConsumer.class); + context = new ClassPathXmlApplicationContext(name, cls); + consumer = this.context.getBean("storedProcedureOutboundChannelAdapter", EventDrivenConsumer.class); } public static class FooAdvice extends AbstractRequestHandlerAdvice { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java index 3c71ba3070..49a93699ef 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.Types; import java.util.List; import java.util.Map; @@ -44,6 +42,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java index cd78995250..a679ce6a76 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.Types; import java.util.Iterator; import java.util.List; @@ -43,6 +41,8 @@ import org.springframework.jdbc.core.SqlParameter; import org.springframework.messaging.MessageChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell @@ -99,8 +99,8 @@ public class StoredProcPollingChannelAdapterParserTests { setUp("storedProcPollingChannelAdapterParserTest2.xml", getClass()); Integer cacheSize = TestUtils.getPropertyValue(this.pollingAdapter, - "source.executor.jdbcCallOperationsCacheSize", - Integer.class); + "source.executor.jdbcCallOperationsCacheSize", + Integer.class); assertThat(cacheSize).as("Wrong JdbcCallOperations Cache Size").isEqualTo(Integer.valueOf(77)); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java index c544b57d19..e0091330cd 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/leader/JdbcLockRegistryLeaderInitiatorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.leader; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -39,6 +37,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/DefaultLockRepositoryTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/DefaultLockRepositoryTests.java index 182776e75c..c8cd38b55b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/DefaultLockRepositoryTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/DefaultLockRepositoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 the original author or authors. + * Copyright 2021-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.jdbc.lock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.sql.Connection; import org.junit.jupiter.api.BeforeEach; @@ -34,6 +29,11 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Ruslan Stelmachenko * diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDelegateTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDelegateTests.java index e525d19aa3..2ff6a720d8 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDelegateTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDelegateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.jdbc.lock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; @@ -35,6 +29,12 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.transaction.TransactionSystemException; import org.springframework.transaction.TransactionTimedOutException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Olivier Hubaut * @author Fran Aranda diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDifferentClientTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDifferentClientTests.java index 5c44ba09d1..bcd040e651 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDifferentClientTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryDifferentClientTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.lock; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; @@ -46,6 +44,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java index 40b79128d8..f9ac8fe0e3 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.lock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Map; import java.util.Queue; import java.util.concurrent.CountDownLatch; @@ -44,6 +41,9 @@ import org.springframework.integration.util.UUIDConverter; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Dave Syer * @author Artem Bilan @@ -471,16 +471,16 @@ public class JdbcLockRegistryTests { assertThat(getRegistryLocks(registry)).hasSize(3); assertThat(getRegistryLocks(registry)).containsKeys(toUUID("foo:2"), - toUUID("foo:3"), - toUUID("foo:4")); + toUUID("foo:3"), + toUUID("foo:4")); //capacity 3->4 registry.setCacheCapacity(CAPACITY_CNT); registry.obtain("foo:5"); assertThat(getRegistryLocks(registry)).hasSize(4); assertThat(getRegistryLocks(registry)).containsKeys(toUUID("foo:3"), - toUUID("foo:4"), - toUUID("foo:5")); + toUUID("foo:4"), + toUUID("foo:5")); } @SuppressWarnings("unchecked") diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStoreTests.java index 1e0f795983..effbc22ee3 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/metadata/JdbcMetadataStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.metadata; -import static org.assertj.core.api.Assertions.assertThat; - import javax.sql.DataSource; import org.junit.jupiter.api.BeforeEach; @@ -28,6 +26,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Bojan Vukasovic * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java index 8640f34ac8..8ee28f49e4 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.mysql; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -49,6 +47,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * This test was created to reproduce INT-2980. * @@ -64,6 +64,7 @@ public class MySqlJdbcMessageStoreMultipleChannelTests { private static final Log LOG = LogFactory.getLog(MySqlJdbcMessageStoreMultipleChannelTests.class); private static final CountDownLatch countDownLatch1 = new CountDownLatch(1); + private static final CountDownLatch countDownLatch2 = new CountDownLatch(1); private static AtomicBoolean success = new AtomicBoolean(true); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java index ec74862bda..7c6b3d3718 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.mysql; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.Properties; @@ -60,6 +58,8 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests.java index 21cc23bf08..43bb607039 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelIntegrationTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.jdbc.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; - import java.io.NotSerializableException; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -47,6 +43,10 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import org.springframework.transaction.support.TransactionTemplate; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelOnePollerIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelOnePollerIntegrationTests.java index 8a688f9395..a9ff82b713 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelOnePollerIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelOnePollerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; @@ -42,6 +39,9 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests.java index a0ad5f81b4..783e463959 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; @@ -42,6 +39,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java index b31bb6638d..634d0b41c8 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreRegionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jdbc.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.List; import org.junit.After; @@ -33,6 +30,9 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java index 651ad9de8d..4734b02021 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.BufferedReader; import java.io.InputStreamReader; import java.lang.reflect.Method; @@ -63,6 +61,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Mark Fisher diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java index 17bcfa9bae..54e540d776 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.store.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.PreparedStatement; import java.sql.SQLException; @@ -43,6 +41,8 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java index 03f8f8d3e6..5853eb1574 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jdbc.store.channel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Map; import java.util.concurrent.CompletionService; @@ -56,6 +54,8 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java index a801dcd100..cf233b5ce3 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +41,7 @@ public class TestService { private final CountDownLatch latch; private int maxNumberOfMessages = 10; + private int threadSleep = 10; public TestService(int maxNumberOfMessages, int threadSleep) { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java index 3b8161fa63..f4e9a4a0ec 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,15 @@ package org.springframework.integration.jdbc.storedproc; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.List; import java.util.Map; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + public class ProcedureParameterTests { @Test diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/User.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/User.java index 3613fa0321..4b816925be 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/User.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/User.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,9 @@ package org.springframework.integration.jdbc.storedproc; */ public class User { private final String username; + private final String password; + private final String email; public User(String username, String password, String email) { diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index f2cf657ce2..1781832f54 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -26,7 +26,6 @@ import java.util.Map.Entry; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.Message; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java index 2ee091d000..0fbd88d92e 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,7 +115,6 @@ public class JmsInboundGateway extends MessagingGatewaySupport implements Orderl } - @Override public String getComponentType() { return this.endpoint.getComponentType(); diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java index ba371f3d71..59de0f8f64 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java @@ -42,7 +42,6 @@ import jakarta.jms.Session; import jakarta.jms.TemporaryQueue; import jakarta.jms.TemporaryTopic; import jakarta.jms.Topic; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java index f50b3700ad..10f2eaefeb 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java @@ -17,7 +17,6 @@ package org.springframework.integration.jms; import jakarta.jms.MessageListener; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java index d00099e1e3..6993823c6c 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsChannelParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.springframework.integration.jms.config; import jakarta.jms.Session; - import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java index b425524213..d50afdf003 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -256,7 +256,7 @@ public class JmsMessageDrivenEndpointParser extends AbstractSingleBeanDefinition + ".listener"; BeanDefinition beanDefinition = builder.getBeanDefinition(); String beanName = BeanDefinitionReaderUtils.generateBeanName(beanDefinition, parserContext.getRegistry()); - BeanComponentDefinition component = new BeanComponentDefinition(beanDefinition, beanName, new String[]{ alias }); + BeanComponentDefinition component = new BeanComponentDefinition(beanDefinition, beanName, new String[] {alias}); parserContext.registerBeanComponent(component); return beanName; } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java index cbd6b6b1a2..216c3568ff 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,8 +97,8 @@ public class JmsOutboundGatewayParser extends AbstractConsumerEndpointParser { boolean hasDestinationName = StringUtils.hasText(destinationNameAttribute); boolean hasDestinationExpression = StringUtils.hasText(destinationExpressionAttribute); int destCount = (hasDestination ? 1 : 0) + - (hasDestinationName ? 1 : 0) + - (hasDestinationExpression ? 1 : 0); + (hasDestinationName ? 1 : 0) + + (hasDestinationExpression ? 1 : 0); if (oneRequired) { if (destCount != 1) { parserContext.getReaderContext().error("Exactly one of the '" + destinationAttribute + "', " diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java index 9faaddc2af..44a7e0f647 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/JmsParserUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,8 +64,8 @@ abstract class JmsParserUtils { private static final String[] JMS_TEMPLATE_ATTRIBUTES = { CONNECTION_FACTORY_ATTRIBUTE, "message-converter", "destination-resolver", PUB_SUB_DOMAIN_ATTRIBUTE, - "time-to-live", "priority", "delivery-persistent", "explicit-qos-enabled", "acknowledge", - "receive-timeout", "session-transacted" + "time-to-live", "priority", "delivery-persistent", "explicit-qos-enabled", "acknowledge", + "receive-timeout", "session-transacted" }; static String determineConnectionFactoryBeanName(Element element, ParserContext parserContext) { diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java index 5e79012e28..2870a85404 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,9 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import jakarta.jms.InvalidDestinationException; import jakarta.jms.JMSException; import jakarta.jms.Session; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -44,6 +35,14 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java index 55b113d78f..2ae2771bcd 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,13 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.Session; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -36,7 +34,7 @@ import org.springframework.jms.support.converter.MessageType; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Mark Fisher diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java index fce946b985..e9e090d001 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +24,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java index a2c115f4ae..822b4a3eda 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java @@ -16,12 +16,9 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +26,8 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java index ebed3b9155..2760f47105 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; @@ -38,7 +30,6 @@ import jakarta.jms.MessageConsumer; import jakarta.jms.Session; import jakarta.jms.TemporaryQueue; import jakarta.jms.TextMessage; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.Test; @@ -58,6 +49,14 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.ObjectUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java index a193cd3038..1f91a4ad68 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +26,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayConnectionTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayConnectionTests.java index 5ead7d7fb2..b0469db5c3 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayConnectionTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayConnectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -28,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; - import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; @@ -46,6 +41,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java index 088a296fc9..2034326272 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/OutboundGatewayFunctionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -28,7 +24,6 @@ import java.util.concurrent.atomic.AtomicReference; import jakarta.jms.Destination; import jakarta.jms.JMSException; - import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.junit.jupiter.api.Test; @@ -42,6 +37,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java index a82fc5e432..afa72d28f4 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -33,7 +27,6 @@ import java.util.concurrent.atomic.AtomicReference; import jakarta.jms.DeliveryMode; import jakarta.jms.Destination; import jakarta.jms.TextMessage; - import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -48,6 +41,12 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SplitterAggregatorTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SplitterAggregatorTests.java index 2b83f0fa52..3bf3184739 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SplitterAggregatorTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SplitterAggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2021 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -47,6 +45,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java index 148f8d8694..8be22df496 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.jms; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -32,7 +24,6 @@ import java.util.concurrent.TimeUnit; import jakarta.jms.Destination; import jakarta.jms.MessageListener; - import org.apache.activemq.artemis.jms.client.ActiveMQQueue; import org.apache.activemq.artemis.jms.client.ActiveMQTopic; import org.apache.commons.logging.Log; @@ -52,6 +43,14 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java index 26fc2f0f7a..a74bd40bbe 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +31,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java index b9f7ec216b..83bc12186f 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,9 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.Destination; import jakarta.jms.Message; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +29,8 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java index ba53744f4f..43535ba9ab 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,9 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.concurrent.atomic.AtomicBoolean; import jakarta.jms.JMSException; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; @@ -41,6 +37,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java index bfe3a552c2..7ba626d8d9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/GlobalChannelInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.jupiter.api.Test; @@ -29,6 +27,8 @@ import org.springframework.messaging.support.InterceptableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java index ca4f1d11da..e495d97147 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,11 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -38,6 +35,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java index c937192665..087d3e3ce1 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -39,6 +33,12 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java index 65b11227ca..04312d80b7 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import jakarta.jms.DeliveryMode; @@ -26,7 +24,6 @@ import jakarta.jms.JMSException; import jakarta.jms.Queue; import jakarta.jms.Session; import jakarta.jms.Topic; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -46,6 +43,8 @@ import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java index ac71c39f92..4e20c2582d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,7 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +29,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java index 8bcb542ec9..570cf4f618 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,7 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.Destination; - import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java index ce02292974..c21973077e 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import org.junit.Test; @@ -33,6 +31,8 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java index a927836696..f17526f53c 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,10 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Properties; import jakarta.jms.ConnectionFactory; import jakarta.jms.DeliveryMode; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -45,6 +41,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java index 8c38cd0179..b26eb2f2fd 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Michael Bannister @@ -53,7 +53,7 @@ public class JmsMessageDrivenChannelAdapterParserTests { assertThat(history).isNotNull(); Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "messageDrivenAdapter", 0); assertThat(componentHistoryRecord).isNotNull(); - JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class); + JmsMessageDrivenEndpoint endpoint = context.getBean("messageDrivenAdapter", JmsMessageDrivenEndpoint.class); assertThat(componentHistoryRecord.get("type")).isEqualTo("jms:message-driven-channel-adapter"); assertThat(message).as("message should not be null").isNotNull(); assertThat(message.getPayload()).isEqualTo("test [with selector: TestProperty = 'foo']"); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointTests.java index 13df677c42..48dd357645 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2021 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,7 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; - import jakarta.jms.MessageListener; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +34,10 @@ import org.springframework.jms.listener.DefaultMessageListenerContainer; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java index b6db3fa7f0..b9a28292b9 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -40,6 +38,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java index 4ee75c548c..4efd94d0fb 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,7 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.DeliveryMode; - import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; @@ -35,6 +32,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java index 5c6bcd5735..aa3da36715 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,9 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Properties; import jakarta.jms.DeliveryMode; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; @@ -44,6 +40,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Jonas Partner * @author Oleg Zhurakousky diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java index 03d90b24bc..0a5b039de0 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,10 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.JMSException; import jakarta.jms.MessageProducer; import jakarta.jms.Session; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +33,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java index dcefbfe1ee..47b5eaa96b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; @@ -42,6 +40,8 @@ import org.springframework.oxm.XmlMappingException; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java index 1997a2c7c5..c394c4f967 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/dsl/JmsTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jms.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -70,6 +67,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.PlatformTransactionManager; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java index 0c026ecb13..38e4e26d31 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/AsyncGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,8 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import jakarta.jms.Message; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +36,8 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests.java index 44d6607edc..84b772f8b8 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/GatewaySerializedReplyChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/MiscellaneousTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/MiscellaneousTests.java index eb3db2ed5e..3a7aca2bde 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/MiscellaneousTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/MiscellaneousTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; @@ -30,6 +28,8 @@ import org.springframework.integration.test.condition.LongRunningTest; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -45,8 +45,8 @@ public class MiscellaneousTests extends ActiveMQMultiContextTests { */ @Test public void testTimeoutHonoringWhenRequestsQueuedUp() throws Exception { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("honor-timeout.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "honor-timeout.xml", getClass())) { final RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class); final CountDownLatch latch = new CountDownLatch(3); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java index 5cfa7c8f1e..024afb13f4 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineJmsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -35,6 +33,8 @@ import org.springframework.integration.jms.ActiveMQMultiContextTests; import org.springframework.integration.test.condition.LongRunningTest; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java index a7e18b3811..4d42f2611e 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/PipelineNamedReplyQueuesJmsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -39,6 +37,8 @@ import org.springframework.integration.test.condition.LongRunningTest; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java index d8c3dad757..616451ec78 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.CountDownLatch; import jakarta.jms.ConnectionFactory; @@ -27,7 +24,6 @@ import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.MessageProducer; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -44,6 +40,9 @@ import org.springframework.jms.listener.SessionAwareMessageListener; import org.springframework.jms.support.converter.SimpleMessageConverter; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -55,8 +54,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestMessageIdOptimized() { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-cached-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-cached-consumers.xml", getClass())) { RequestReplyExchanger gateway = context .getBean("standardMessageIdCopyingConsumerWithOptimization", RequestReplyExchanger.class); @@ -82,8 +81,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestMessageIdNonOptimized() { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-cached-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-cached-consumers.xml", getClass())) { RequestReplyExchanger gateway = context .getBean("standardMessageIdCopyingConsumerWithoutOptimization", RequestReplyExchanger.class); @@ -109,8 +108,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestCorrelationIdOptimized() { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-cached-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-cached-consumers.xml", getClass())) { RequestReplyExchanger gateway = context .getBean("correlationPropagatingConsumerWithOptimization", RequestReplyExchanger.class); @@ -137,8 +136,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestCorrelationIdNonOptimized() { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-cached-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-cached-consumers.xml", getClass())) { RequestReplyExchanger gateway = context .getBean("correlationPropagatingConsumerWithoutOptimization", RequestReplyExchanger.class); @@ -164,8 +163,8 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReplyOptimized() throws Exception { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-cached-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-cached-consumers.xml", getClass())) { RequestReplyExchanger gateway = context.getBean("correlationPropagatingConsumerWithOptimizationDelayFirstReply", diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java index 2bdb84e3d5..6e86c4ac9b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCorrelationKeyProvidedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.UUID; import org.junit.jupiter.api.Test; @@ -32,6 +30,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.jms.support.JmsHeaders; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java index f281d4147c..3298583b23 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,10 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; import jakarta.jms.Message; import jakarta.jms.TextMessage; - import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; @@ -35,6 +31,9 @@ import org.springframework.integration.test.condition.LongRunningTest; import org.springframework.jms.core.JmsTemplate; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -45,8 +44,8 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu @Test public void messageCorrelationBasedOnRequestMessageIdOptimized() { - try (AbstractApplicationContext context = - new ClassPathXmlApplicationContext("producer-no-cached-consumers.xml", this.getClass())) { + try (AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "producer-no-cached-consumers.xml", this.getClass())) { RequestReplyExchanger gateway = context.getBean("optimizedMessageId", RequestReplyExchanger.class); ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class); @@ -71,8 +70,8 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu @Test public void messageCorrelationBasedOnRequestMessageIdNonOptimized() { - try (AbstractApplicationContext context = - new ClassPathXmlApplicationContext("producer-no-cached-consumers.xml", this.getClass())) { + try (AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "producer-no-cached-consumers.xml", this.getClass())) { RequestReplyExchanger gateway = context.getBean("nonoptimizedMessageId", RequestReplyExchanger.class); ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class); @@ -96,8 +95,8 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu @Test public void messageCorrelationBasedOnRequestCorrelationIdOptimized() { - try (AbstractApplicationContext context = - new ClassPathXmlApplicationContext("producer-no-cached-consumers.xml", this.getClass())) { + try (AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "producer-no-cached-consumers.xml", this.getClass())) { RequestReplyExchanger gateway = context.getBean("optimized", RequestReplyExchanger.class); ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class); @@ -121,8 +120,8 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu @Test public void messageCorrelationBasedOnRequestCorrelationIdNonOptimized() { - try (AbstractApplicationContext context = - new ClassPathXmlApplicationContext("producer-no-cached-consumers.xml", this.getClass())) { + try (AbstractApplicationContext context = new ClassPathXmlApplicationContext( + "producer-no-cached-consumers.xml", this.getClass())) { RequestReplyExchanger gateway = context.getBean("nonoptimized", RequestReplyExchanger.class); ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java index 3b5de9d897..cd2ba4b9f2 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -32,7 +29,6 @@ import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.MessageProducer; import jakarta.jms.TextMessage; - import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; @@ -54,6 +50,9 @@ import org.springframework.jms.support.converter.SimpleMessageConverter; import org.springframework.messaging.MessageDeliveryException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -68,8 +67,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti @SuppressWarnings("resource") @Test public void messageCorrelationBasedOnRequestMessageId() { - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-temp-reply-consumers.xml", this.getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-temp-reply-consumers.xml", this.getClass())) { RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class); CachingConnectionFactory connectionFactory = context.getBean(CachingConnectionFactory.class); @@ -107,8 +106,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti @Test public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReply() throws Exception { DefaultMessageListenerContainer dmlc = new DefaultMessageListenerContainer(); - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("producer-temp-reply-consumers.xml", getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "producer-temp-reply-consumers.xml", getClass())) { RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class); ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class); @@ -212,8 +211,8 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti @Test public void testConcurrently() throws Exception { ExecutorService executor = Executors.newFixedThreadPool(10); - try (ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("multi-producer-and-consumers-temp-reply.xml", this.getClass())) { + try (ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "multi-producer-and-consumers-temp-reply.xml", this.getClass())) { final RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class); final int testNumbers = 30; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests.java index bfbf32a5c9..235fe6376a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/StopStartTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2021 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jms.request_reply; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterHelper.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterHelper.java index 48f6ff9ee4..eca94a43e7 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterHelper.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/MBeanExporterHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ class MBeanExporterHelper implements DestructionAwareBeanPostProcessor, Ordered if (!this.mBeanExportersForExcludes.isEmpty()) { autoCreateChannelCandidatesNames .stream(). - >map(candidateName -> + >map(candidateName -> mBeanExporter -> mBeanExporter.addExcludedBean(candidateName)) .forEach(this.mBeanExportersForExcludes::forEach); } diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java index 6d11be4a31..ba22b23847 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java @@ -147,7 +147,7 @@ public class IntegrationMBeanExporter extends MBeanExporter private String domain = DEFAULT_DOMAIN; - private String[] componentNamePatterns = { "*" }; + private String[] componentNamePatterns = {"*"}; private volatile long shutdownDeadline; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java index 586622d0de..ba4823c2b9 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.atomic.AtomicInteger; import javax.management.MBeanServer; @@ -28,6 +26,8 @@ import org.springframework.jmx.support.MBeanServerFactoryBean; import org.springframework.jmx.support.ObjectNameManager; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java index ff03117b97..5e840239e3 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -34,6 +32,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stuart Williams * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanTreePollingMessageSourceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanTreePollingMessageSourceTests.java index 7515c13e73..b2328ca013 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanTreePollingMessageSourceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanTreePollingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -29,6 +27,8 @@ import org.junit.Test; import org.springframework.jmx.support.MBeanServerFactoryBean; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stuart Williams * @author Artem Bilan diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java index 9ec31939e2..d235a6ae24 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.atomic.AtomicInteger; import javax.management.MBeanServer; @@ -43,6 +40,9 @@ import org.springframework.jmx.support.MBeanServerFactoryBean; import org.springframework.jmx.support.ObjectNameManager; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java index 2a0d1b91d5..894ad781f8 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -40,6 +38,8 @@ import org.springframework.jmx.support.ObjectNameManager; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan @@ -60,7 +60,7 @@ public class NotificationPublishingMessageHandlerTests { this.context.registerBean("mbeanServer", MBeanServerFactoryBean.class, MBeanServerFactoryBean::new); this.context.registerSingleton("exporter", IntegrationMBeanExporter.class, new MutablePropertyValues() - .add("server", new RuntimeBeanReference("mbeanServer"))); + .add("server", new RuntimeBeanReference("mbeanServer"))); this.context.registerSingleton("anotherExporter", MBeanExporter.class); RootBeanDefinition publisherDefinition = new RootBeanDefinition(NotificationPublishingMessageHandler.class); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java index 43fa71d67f..ac89d6da71 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -41,6 +38,9 @@ import org.springframework.jmx.support.ObjectNameManager; import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * See DynamicRouterTests for additional tests where the MBean is registered by the Spring exporter. * @@ -143,7 +143,7 @@ public class OperationInvokingMessageHandlerTests { handler.setOperationName("x"); handler.setBeanFactory(mock(BeanFactory.class)); handler.afterPropertiesSet(); - List params = Arrays.asList(new Object[] { "foo", 123 }); + List params = Arrays.asList(new Object[] {"foo", 123}); Message message = MessageBuilder.withPayload(params).build(); handler.handleMessage(message); Message reply = outputChannel.receive(0); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java index 8d2ff12c2e..32f4f99817 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/ServiceActivatorDefaultFrameworkMethodTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; @@ -37,6 +34,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * See INT-1688 for background. * diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java index 98e2ee848c..28206a8207 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -40,6 +38,8 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.1 @@ -95,7 +95,7 @@ public class UpdateMappingsTests { MessagingTemplate messagingTemplate = new MessagingTemplate(); messagingTemplate.setReceiveTimeout(1000); Set names = this.server.queryNames(ObjectName - .getInstance("update.mapping.domain:type=MessageHandler,name=router,bean=endpoint"), + .getInstance("update.mapping.domain:type=MessageHandler,name=router,bean=endpoint"), null); assertThat(names.size()).isEqualTo(1); Map map = new HashMap(); @@ -103,7 +103,7 @@ public class UpdateMappingsTests { map.put("baz", "qux"); Object[] params = new Object[] {map}; this.server.invoke(names.iterator().next(), "setChannelMappings", params, - new String[] { "java.util.Map" }); + new String[] {"java.util.Map"}); Map mappings = messagingTemplate.convertSendAndReceive(control, "@'router.handler'.getChannelMappings()", Map.class); assertThat(mappings).isNotNull(); assertThat(mappings.size()).isEqualTo(2); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java index e5e50861ef..2ca8bc9ec8 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java index 07382023f5..a1648074bd 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -28,6 +26,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/CustomObjectNameTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/CustomObjectNameTests.java index f5d56abfdf..ddaf589f3e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/CustomObjectNameTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/CustomObjectNameTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Iterator; import java.util.List; import java.util.Set; @@ -47,6 +44,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @since 4.2.1 diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java index 7eedb5dc83..d667354a1e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -70,20 +70,22 @@ public class DynamicRouterTests { private NullChannel nullChannel; - @Test @DirtiesContext + @Test + @DirtiesContext public void testRouteChange() throws Exception { routingChannel.send(new GenericMessage("123")); assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123"); routingChannel.send(MessageBuilder.withPayload(123).build()); assertThat(processBChannel.receive(0).getPayload()).isEqualTo(123); - controlChannel.send(MessageBuilder.withPayload(new String[]{"java.lang.String", "processCChannel"}).build()); + controlChannel.send(MessageBuilder.withPayload(new String[] {"java.lang.String", "processCChannel"}).build()); routingChannel.send(new GenericMessage("123")); assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123"); } - @Test @DirtiesContext + @Test + @DirtiesContext public void testRouteChangeMap() throws Exception { routingChannel.send(new GenericMessage("123")); assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123"); @@ -99,7 +101,8 @@ public class DynamicRouterTests { assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123"); } - @Test @DirtiesContext + @Test + @DirtiesContext public void testRouteChangeMapNamedArgs() throws Exception { routingChannel.send(new GenericMessage("123")); assertThat(processAChannel.receive(0).getPayload()).isEqualTo("123"); @@ -115,7 +118,9 @@ public class DynamicRouterTests { assertThat(processCChannel.receive(0).getPayload()).isEqualTo("123"); } - @Test @DirtiesContext @Ignore + @Test + @DirtiesContext + @Ignore public void testPerf() throws Exception { // this.nullChannel.enableStats(false); for (int i = 0; i < 1000000000; i++) { diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanAutoDetectTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanAutoDetectTests.java index 02173fb017..1d42cac627 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanAutoDetectTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanAutoDetectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -28,6 +26,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Artem Bilan diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java index f99c239e41..c93c4a5e5b 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanExporterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import javax.management.MBeanServer; @@ -31,6 +29,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java index db5fcc15f6..e8b0b93c00 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationCustomNamingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell @@ -73,6 +73,7 @@ public class MBeanRegistrationCustomNamingTests { public static class Namer implements ObjectNamingStrategy { private final ObjectNamingStrategy realNamer = new KeyNamingStrategy(); + @Override public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException { String actualBeanKey = beanKey.replace("type=", "type=Integration,componentType="); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationTests.java index 82ac90caeb..58433d878b 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanRegistrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -36,6 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java index 86b915e930..16a7789773 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -36,6 +34,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Stuart Williams * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MessageStoreTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MessageStoreTests.java index acde50c1c2..95adc91ab5 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MessageStoreTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MessageStoreTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java index bfe8128b32..1205946848 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java index c310faa8e9..54ef908e26 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import javax.management.Notification; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java index aa8245fd6c..54309d3845 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Set; import javax.management.Attribute; @@ -44,6 +41,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Mark Fisher * @author Artem Bilan @@ -141,7 +141,8 @@ public class NotificationPublishingChannelAdapterParserTests { assertThat(names.size()).isEqualTo(1); } - @Test @DirtiesContext + @Test + @DirtiesContext public void changeMessageHistoryPatterns() throws Exception { Set mbeans = server.queryMBeans(null, null); boolean tested = false; @@ -159,7 +160,7 @@ public class NotificationPublishingChannelAdapterParserTests { catch (Exception e) { throw e; } - server.invoke(objectName, "stop", new Object[]{}, new String[]{}); + server.invoke(objectName, "stop", new Object[] {}, new String[] {}); server.setAttribute(objectName, new Attribute("ComponentNamePatternsString", "foo, bar")); assertThat(server.getAttribute(objectName, "ComponentNamePatternsString")).isEqualTo("bar,foo"); tested = true; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java index e57f302a1b..4faea1954e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -39,6 +34,11 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java index b244826878..08d45017ef 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,6 +41,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Oleg Zhurakousky @@ -79,7 +79,6 @@ public class OperationInvokingOutboundGatewayTests { private MessageHandler operationInvokingWithinChain; - private static volatile int adviceCalled; @After @@ -100,7 +99,7 @@ public class OperationInvokingOutboundGatewayTests { @Test public void gatewayWithPrimitiveArgs() throws Exception { - primitiveChannel.send(new GenericMessage(new Object[] { true, 0L, 1 })); + primitiveChannel.send(new GenericMessage(new Object[] {true, 0L, 1})); assertThat(testBean.messages.size()).isEqualTo(1); List argList = new ArrayList(); argList.add(false); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java index 24abf503f0..7a5c4b7b06 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PollingAdapterMBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java index e03d18016f..ea429bfa79 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -33,6 +31,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java index a9ab5ef2f3..b0b143e677 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; import java.util.Set; @@ -33,6 +31,8 @@ import org.junit.runners.Parameterized.Parameters; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @since 2.0 @@ -52,10 +52,10 @@ public class RouterMBeanTests { @Parameters public static List getParameters() { return Arrays.asList( - new Object[] { "RouterMBeanTests-context.xml" }, - new Object[] { "RouterMBeanGatewayTests-context.xml" }, - new Object[] { "RouterMBeanNoneTests-context.xml" }, - new Object[] { "RouterMBeanSwitchTests-context.xml" }); + new Object[] {"RouterMBeanTests-context.xml"}, + new Object[] {"RouterMBeanGatewayTests-context.xml"}, + new Object[] {"RouterMBeanNoneTests-context.xml"}, + new Object[] {"RouterMBeanSwitchTests-context.xml"}); } @After diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanVanillaTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanVanillaTests.java index 775f39501f..534518ea00 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanVanillaTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/RouterMBeanVanillaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/SimpleDynamicRouter.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/SimpleDynamicRouter.java index 532f5cb926..760556a6d6 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/SimpleDynamicRouter.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/SimpleDynamicRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import org.springframework.util.Assert; * @author Oleg Zhurakousky * */ + /** * * @@ -34,6 +35,7 @@ import org.springframework.util.Assert; @ManagedResource public class SimpleDynamicRouter { private final Map channelMappings = new HashMap(); + /** * * @param channelMappings @@ -44,6 +46,7 @@ public class SimpleDynamicRouter { this.channelMappings.put(key, channelMappings.get(key)); } } + /** * * @param key @@ -53,6 +56,7 @@ public class SimpleDynamicRouter { public void addChannelMapping(String key, String channelName) { this.channelMappings.put(key, channelName); } + /** * * @param key @@ -60,12 +64,14 @@ public class SimpleDynamicRouter { public void removeChannelMapping(String key) { this.channelMappings.remove(key); } + /** * */ public Map getChannelMappings() { return channelMappings; } + /** * * @param key diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/TestPublisher.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/TestPublisher.java index f4049bf8e0..371a0e8441 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/TestPublisher.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/TestPublisher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,6 +41,7 @@ public class TestPublisher implements NotificationPublisherAware, BeanNameAware public void setBeanName(String name) { this.beanName = name; } + public void send(String s) { Notification notification = new Notification("test.type", "org.springframework.integration.jmx.config:type=TestPublisher,name=" + this.beanName, 1, s); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/DslMBeanTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/DslMBeanTests.java index cceed9b09b..6c0568f2ad 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/DslMBeanTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/DslMBeanTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.configuration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -36,6 +34,8 @@ import org.springframework.jmx.support.MBeanServerFactoryBean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/EnableMBeanExportTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/EnableMBeanExportTests.java index dcc9ea032e..579269f709 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/EnableMBeanExportTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/configuration/EnableMBeanExportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jmx.configuration; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Set; @@ -45,6 +43,8 @@ import org.springframework.mock.env.MockEnvironment; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell @@ -105,7 +105,7 @@ public class EnableMBeanExportTests { @EnableIntegrationMBeanExport( server = "#{mbeanServer}", defaultDomain = "${managed.domain}", - managedComponents = { "input", "${managed.component}" }) + managedComponents = {"input", "${managed.component}"}) @EnableIntegrationManagement(defaultLoggingEnabled = "false") public static class ContextConfiguration { diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java index 969123139a..ff5972e462 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChainWithMessageProducingHandlersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +25,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -52,7 +52,9 @@ public class ChainWithMessageProducingHandlersTests { return value; } } + public static class SampleService { - public void echo(String value) { } + public void echo(String value) { + } } } diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java index c8e152e894..c813f55537 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import org.apache.commons.logging.Log; @@ -31,6 +29,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java index ae2ccb073a..69d6aa7719 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2020 the original author or authors. + * Copyright 2009-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Arrays; import java.util.Date; import java.util.Set; @@ -54,6 +51,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.Assert; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Dave Syer * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java index 564aa22c88..b5c5191c0e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2011-2019 the original author or authors. + * Copyright 2011-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class MessageMetricsAdviceTests { this.beanDefinitionRegistry.registerBeanDefinition("test", BeanDefinitionBuilder.genericBeanDefinition(MessageHandler.class, () -> advised) - .getRawBeanDefinition()); + .getRawBeanDefinition()); MessageHandler exported = this.beanFactory.getBean("test", MessageHandler.class); exported.handleMessage(MessageBuilder.withPayload("test").build()); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceTests.java index 26f5a0b89c..4bc8e15467 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.Attribute; @@ -41,6 +39,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 5.0 diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java index ce5397bd02..c5a222dcf9 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -39,6 +37,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java index 53a02756f6..c47d73e213 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import javax.management.Notification; import org.junit.Test; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * To run, add JVM Args: *

@@ -109,6 +109,5 @@ public class RemoteMBeanServerTests { return "bar"; } - } } diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ScatterGatherHandlerIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ScatterGatherHandlerIntegrationTests.java index a21928e59d..bbb4df45f1 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ScatterGatherHandlerIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ScatterGatherHandlerIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; import java.util.concurrent.Executor; @@ -56,6 +54,8 @@ import org.springframework.messaging.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/TransformerContextTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/TransformerContextTests.java index 8c89d9b4be..a8f97e9309 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/TransformerContextTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/TransformerContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.monitor; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +31,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/Int2307Tests.java b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/Int2307Tests.java index 0ccd453cca..faf20418c6 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/Int2307Tests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/Int2307Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration_.mbeanexporterhelper; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Set; @@ -30,6 +28,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.test.util.TestUtils; import org.springframework.jmx.export.MBeanExporter; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java index 5d75d4683a..1405eaa9aa 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/AbstractJpaOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * @see UpdatingJpaOutboundGatewayParser * */ -public abstract class AbstractJpaOutboundGatewayParser extends AbstractConsumerEndpointParser { +public abstract class AbstractJpaOutboundGatewayParser extends AbstractConsumerEndpointParser { @Override protected BeanDefinitionBuilder parseHandler(Element gatewayElement, ParserContext parserContext) { diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/JpaNamespaceHandler.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/JpaNamespaceHandler.java index 9e4be0dd59..9708316cf6 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/JpaNamespaceHandler.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/JpaNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public class JpaNamespaceHandler extends AbstractIntegrationNamespaceHandler { * @see org.springframework.beans.factory.xml.NamespaceHandler#init() */ public void init() { - this.registerBeanDefinitionParser("inbound-channel-adapter", new JpaInboundChannelAdapterParser()); + this.registerBeanDefinitionParser("inbound-channel-adapter", new JpaInboundChannelAdapterParser()); this.registerBeanDefinitionParser("outbound-channel-adapter", new JpaOutboundChannelAdapterParser()); this.registerBeanDefinitionParser("updating-outbound-gateway", new UpdatingJpaOutboundGatewayParser()); this.registerBeanDefinitionParser("retrieving-outbound-gateway", new RetrievingJpaOutboundGatewayParser()); diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/RetrievingJpaOutboundGatewayParser.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/RetrievingJpaOutboundGatewayParser.java index b4433ab20a..68f657be6a 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/RetrievingJpaOutboundGatewayParser.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/RetrievingJpaOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,9 +87,9 @@ public class RetrievingJpaOutboundGatewayParser extends AbstractJpaOutboundGatew BeanDefinitionBuilder jpaExecutorBuilder) { if (StringUtils.hasText(gatewayElement.getAttribute("id-expression"))) { - String[] otherAttributes = { "jpa-query", "native-query", "named-query", "first-result", + String[] otherAttributes = {"jpa-query", "native-query", "named-query", "first-result", "first-result-expression", "max-results", "max-results-expression", "delete-in-batch", - "expect-single-result", "parameter-source-factory", "use-payload-as-parameter-source" }; + "expect-single-result", "parameter-source-factory", "use-payload-as-parameter-source"}; String others = Arrays.stream(otherAttributes) diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/UpdatingJpaOutboundGatewayParser.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/UpdatingJpaOutboundGatewayParser.java index 37c22dfd65..f82abe3116 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/UpdatingJpaOutboundGatewayParser.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/UpdatingJpaOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class UpdatingJpaOutboundGatewayParser extends AbstractJpaOutboundGateway parserContext.registerBeanComponent( new BeanComponentDefinition(jpaExecutorBuilderBeanDefinition, jpaExecutorBeanName)); - return jpaOutboundGatewayBuilder.addPropertyReference("jpaExecutor", jpaExecutorBeanName) + return jpaOutboundGatewayBuilder.addPropertyReference("jpaExecutor", jpaExecutorBeanName) .addPropertyValue("gatewayType", OutboundGatewayType.UPDATING); } diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java index 1513513afd..16e1994b0b 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public interface JpaOperations { * @param source The parameter source. * @return The number of entities updated. */ - int executeUpdateWithNamedQuery(String updateQuery, ParameterSource source); + int executeUpdateWithNamedQuery(String updateQuery, ParameterSource source); /** * @@ -71,7 +71,7 @@ public interface JpaOperations { * @param source The parameter source. * @return The number of entities updated */ - int executeUpdateWithNativeQuery(String updateQuery, ParameterSource source); + int executeUpdateWithNativeQuery(String updateQuery, ParameterSource source); /** diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaParameter.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaParameter.java index c72d3cfb8c..9eb3ea9c3c 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaParameter.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ public class JpaParameter { private Object value; - private String expression; + private String expression; private Expression spelExpression; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaUtils.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaUtils.java index 59c4f2b60d..a1526dc08c 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaUtils.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/support/JpaUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,7 @@ public final class JpaUtils { private static final Pattern ALIAS_MATCH; private static final String IDENTIFIER = "[\\p{Alnum}._$]+"; + private static final String IDENTIFIER_GROUP = String.format("(%s)", IDENTIFIER); static { diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaInboundChannelAdapterParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaInboundChannelAdapterParserTests.java index 2bab399db8..95591f0f48 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaInboundChannelAdapterParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jpa.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Amol Nayak diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java index 043d3f97c0..0be1b5cfdd 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jpa.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.After; @@ -39,6 +37,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Gunnar Hillert @@ -161,7 +161,7 @@ public class JpaMessageHandlerParserTests { assertThat(jpaParameters).isNotNull(); assertThat(jpaParameters.size() == 3).isTrue(); -} + } @SuppressWarnings("unchecked") @Test @@ -220,8 +220,8 @@ public class JpaMessageHandlerParserTests { } public void setUp(String name, Class cls) { - context = new ClassPathXmlApplicationContext(name, cls); - consumer = this.context.getBean("jpaOutboundChannelAdapter", EventDrivenConsumer.class); + context = new ClassPathXmlApplicationContext(name, cls); + consumer = this.context.getBean("jpaOutboundChannelAdapter", EventDrivenConsumer.class); } public static class FooAdvice extends AbstractRequestHandlerAdvice { diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java index 2be5012fd6..bfd1c0da8f 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.jpa.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; - import org.junit.jupiter.api.Test; import org.springframework.aop.support.AopUtils; @@ -47,6 +42,11 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; + /** * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/AbstractJpaOperationsTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/AbstractJpaOperationsTests.java index e99096d2cc..cf383a0096 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/AbstractJpaOperationsTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/AbstractJpaOperationsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.jpa.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -41,6 +37,10 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.DefaultTransactionDefinition; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Gunnar Hillert * @author Gary Russell diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java index f790268421..e170d42d58 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java @@ -16,17 +16,11 @@ package org.springframework.integration.jpa.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.mock; - import java.util.Collections; import java.util.List; import java.util.Map; import jakarta.persistence.EntityManager; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; @@ -43,6 +37,11 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.mock; + /** * @author Gunnar Hillert * @author Amol Nayak diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/dsl/JpaTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/dsl/JpaTests.java index 10294e0b70..ca003cb531 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/dsl/JpaTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/dsl/JpaTests.java @@ -16,14 +16,11 @@ package org.springframework.integration.jpa.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Calendar; import java.util.Date; import java.util.List; import jakarta.persistence.EntityManagerFactory; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -58,6 +55,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.interceptor.TransactionInterceptor; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java index 6f798f7d9d..edeea71142 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,11 @@ package org.springframework.integration.jpa.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.util.ArrayList; import java.util.Collection; import java.util.List; import jakarta.persistence.EntityManager; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +42,9 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * Integration tests for the Jpa Polling Channel Adapter {@link JpaPollingChannelAdapter}. * diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterUnitTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterUnitTests.java index acc957251c..ef977f3ca0 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterUnitTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.jpa.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.junit.Test; import org.springframework.integration.jpa.core.JpaExecutor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java index 66b9427741..61f59065b1 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,9 @@ package org.springframework.integration.jpa.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.List; import jakarta.persistence.EntityManager; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -43,6 +39,9 @@ import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallbackWithoutResult; import org.springframework.transaction.support.TransactionTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java index 6f408757f4..6936ecce38 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.jpa.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import javax.sql.DataSource; @@ -36,6 +34,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java index 060ab9d30f..ef00c66452 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java @@ -16,13 +16,9 @@ package org.springframework.integration.jpa.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.List; import jakarta.persistence.EntityManager; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -38,6 +34,9 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * The test cases for testing out a complete flow of the JPA gateways/adapters with all * the components integrated. diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java index 6df7421a7f..ced7490f38 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.jpa.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.util.List; import org.junit.jupiter.api.AfterEach; @@ -34,6 +30,10 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + /** * * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/support/parametersource/ExpressionEvaluatingParameterSourceFactoryTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/support/parametersource/ExpressionEvaluatingParameterSourceFactoryTests.java index 7b76e5a34f..ad7592c8e0 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/support/parametersource/ExpressionEvaluatingParameterSourceFactoryTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/support/parametersource/ExpressionEvaluatingParameterSourceFactoryTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.jpa.support.parametersource; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -29,6 +26,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.jpa.support.JpaParameter; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java index c51aa28c4b..14937f3aac 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,11 +47,11 @@ public final class JpaTestUtils { dateOfBirth.set(1984, 0, 31); StudentDomain student = new StudentDomain() - .withFirstName("First Executor") - .withLastName("Last Executor") - .withGender(Gender.MALE) - .withDateOfBirth(dateOfBirth.getTime()) - .withLastUpdated(new Date()); + .withFirstName("First Executor") + .withLastName("Last Executor") + .withGender(Gender.MALE) + .withDateOfBirth(dateOfBirth.getTime()) + .withLastUpdated(new Date()); return student; } diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/Gender.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/Gender.java index ccc434916c..3053c2e9b5 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/Gender.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/Gender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ public enum Gender { MALE("M"), FEMALE("F"); private String identifier; + private static Map identifierMap; Gender(String identifier) { @@ -44,7 +45,7 @@ public enum Gender { static { EnumSet all = EnumSet.allOf(Gender.class); identifierMap = new HashMap(); - for (Gender gender:all) { + for (Gender gender : all) { identifierMap.put(gender.getIdentifier(), gender); } } diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/StudentDomain.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/StudentDomain.java index 855b0248f6..cc499f2fe0 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/StudentDomain.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/entity/StudentDomain.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,9 +44,9 @@ import jakarta.persistence.TemporalType; @Entity(name = "Student") @Table(name = "Student") @NamedQueries({ - @NamedQuery(name = "selectAllStudents", query = "select s from Student s"), - @NamedQuery(name = "selectStudent", query = "select s from Student s where s.lastName = 'Last One'"), - @NamedQuery(name = "updateStudent", query = "update Student s set s.lastName = :lastName, s.lastUpdated = :lastUpdated where s.rollNumber in (select max(a.rollNumber) from Student a)") + @NamedQuery(name = "selectAllStudents", query = "select s from Student s"), + @NamedQuery(name = "selectStudent", query = "select s from Student s where s.lastName = 'Last One'"), + @NamedQuery(name = "updateStudent", query = "update Student s set s.lastName = :lastName, s.lastUpdated = :lastUpdated where s.rollNumber in (select max(a.rollNumber) from Student a)") }) @NamedNativeQuery(resultClass = StudentDomain.class, name = "updateStudentNativeQuery", query = "update Student s set s.lastName = :lastName, lastUpdated = :lastUpdated where s.rollNumber in (select max(a.rollNumber) from Student a)") @SequenceGenerator(name = "student_sequence", initialValue = 1004, allocationSize = 1) diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/channel/AbstractKafkaChannel.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/channel/AbstractKafkaChannel.java index 33a00ff4c7..d9b872f87d 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/channel/AbstractKafkaChannel.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/channel/AbstractKafkaChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,8 +72,8 @@ public abstract class AbstractKafkaChannel extends AbstractMessageChannel { protected boolean doSend(Message message, long timeout) { try { this.template.send(MessageBuilder.fromMessage(message) - .setHeader(KafkaHeaders.TOPIC, this.topic) - .build()) + .setHeader(KafkaHeaders.TOPIC, this.topic) + .build()) .get(timeout < 0 ? Long.MAX_VALUE : timeout, TimeUnit.MILLISECONDS); } catch (@SuppressWarnings("unused") InterruptedException e) { diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaOutboundChannelAdapterParser.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaOutboundChannelAdapterParser.java index 85f006d714..4c46e3e304 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaOutboundChannelAdapterParser.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/config/xml/KafkaOutboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ public class KafkaOutboundChannelAdapterParser extends AbstractOutboundChannelAd @Override protected AbstractBeanDefinition parseConsumer(final Element element, final ParserContext parserContext) { final BeanDefinitionBuilder builder = - BeanDefinitionBuilder.genericBeanDefinition(KafkaProducerMessageHandler.class); + BeanDefinitionBuilder.genericBeanDefinition(KafkaProducerMessageHandler.class); KafkaParsingUtils.commonOutboundProperties(element, parserContext, builder); return builder.getBeanDefinition(); diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaOutboundGatewaySpec.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaOutboundGatewaySpec.java index c243b1a82d..aba1c68d99 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaOutboundGatewaySpec.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/dsl/KafkaOutboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2021 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class KafkaOutboundGatewaySpec the reply value type. */ public static class KafkaGatewayMessageHandlerTemplateSpec - extends KafkaOutboundGatewaySpec> + extends KafkaOutboundGatewaySpec> implements ComponentsRegistration { private final ReplyingKafkaTemplateSpec kafkaTemplateSpec; diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java index cc3c578ad7..cf9428f805 100644 --- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java +++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandler.java @@ -171,7 +171,7 @@ public class KafkaProducerMessageHandler extends AbstractReplyProducingMes if (this.isGateway) { setAsync(true); updateNotPropagatedHeaders( - new String[]{ KafkaHeaders.TOPIC, KafkaHeaders.PARTITION, KafkaHeaders.KEY }, false); + new String[] {KafkaHeaders.TOPIC, KafkaHeaders.PARTITION, KafkaHeaders.KEY}, false); } if (JacksonPresent.isJackson2Present()) { this.headerMapper = new DefaultKafkaHeaderMapper(); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/channnel/ChannelTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/channnel/ChannelTests.java index 04d174e6ff..fd4115459f 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/channnel/ChannelTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/channnel/ChannelTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.channnel; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -53,6 +51,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests.java index 6e5c511ae4..2268f266a7 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +25,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/ChannelParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/ChannelParserTests.java index bc856edc9f..d2bf88859b 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/ChannelParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/ChannelParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +34,9 @@ import org.springframework.kafka.listener.ConsumerProperties; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests.java index 4393d54f51..30a745e459 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.kafka.clients.consumer.ConsumerConfig; import org.junit.jupiter.api.Test; @@ -30,6 +28,8 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @@ -53,21 +53,21 @@ public class KafkaInboundChannelAdapterParserTests { @Test public void testProps() { - assertThat(TestUtils.getPropertyValue(this.source1, "consumerProperties.topics")).isEqualTo(new String[] { "topic1" }); + assertThat(TestUtils.getPropertyValue(this.source1, "consumerProperties.topics")).isEqualTo(new String[] {"topic1"}); assertThat(TestUtils.getPropertyValue(this.source1, "consumerFactory")) - .isSameAs(this.context.getBean("consumerFactory")); + .isSameAs(this.context.getBean("consumerFactory")); assertThat(TestUtils.getPropertyValue(this.source1, "ackCallbackFactory")) - .isSameAs(this.context.getBean("ackFactory")); + .isSameAs(this.context.getBean("ackFactory")); assertThat(TestUtils.getPropertyValue(this.source1, "consumerProperties.clientId")).isEqualTo("client"); assertThat(TestUtils.getPropertyValue(this.source1, "consumerProperties.groupId")).isEqualTo("group"); assertThat(TestUtils.getPropertyValue(this.source1, "messageConverter")) - .isSameAs(this.context.getBean("converter")); + .isSameAs(this.context.getBean("converter")); assertThat(TestUtils.getPropertyValue(this.source1, "payloadType")).isEqualTo(String.class); assertThat(TestUtils.getPropertyValue(this.source1, "rawMessageHeader", Boolean.class)).isTrue(); assertThat(TestUtils.getPropertyValue(this.source1, "consumerProperties.consumerRebalanceListener")) - .isSameAs(this.context.getBean("rebal")); + .isSameAs(this.context.getBean("rebal")); - assertThat(TestUtils.getPropertyValue(this.source2, "consumerProperties.topics")).isEqualTo(new String[] { "topic1", "topic2" }); + assertThat(TestUtils.getPropertyValue(this.source2, "consumerProperties.topics")).isEqualTo(new String[] {"topic1", "topic2"}); DefaultKafkaConsumerFactory cf = TestUtils.getPropertyValue(this.source2, "consumerFactory", DefaultKafkaConsumerFactory.class); assertThat(cf).isSameAs(this.context.getBean("multiFetchConsumerFactory")); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundGatewayTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundGatewayTests.java index 6add2cd85e..fd561f9285 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundGatewayTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +26,8 @@ import org.springframework.kafka.listener.KafkaMessageListenerContainer; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @@ -58,11 +58,11 @@ public class KafkaInboundGatewayTests { assertThat(TestUtils.getPropertyValue(this.gateway1, "listener.fallbackType")) .isEqualTo(String.class); assertThat(TestUtils.getPropertyValue(this.gateway1, "errorMessageStrategy")) - .isSameAs(this.context.getBean("ems")); + .isSameAs(this.context.getBean("ems")); assertThat(TestUtils.getPropertyValue(this.gateway1, "retryTemplate")) - .isSameAs(this.context.getBean("retryTemplate")); + .isSameAs(this.context.getBean("retryTemplate")); assertThat(TestUtils.getPropertyValue(this.gateway1, "recoveryCallback")) - .isSameAs(this.context.getBean("recoveryCallback")); + .isSameAs(this.context.getBean("recoveryCallback")); assertThat(TestUtils.getPropertyValue(this.gateway1, "messagingTemplate.sendTimeout")).isEqualTo(5000L); assertThat(TestUtils.getPropertyValue(this.gateway1, "replyTimeout")).isEqualTo(43L); } diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests.java index 2c2b93c27f..1e726e5b8c 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaMessageDrivenChannelAdapterParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Collections; import org.junit.jupiter.api.Test; @@ -41,6 +38,9 @@ import org.springframework.retry.support.RetryTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Artem Bilan. * @author Gary Russell diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java index e573875052..d5ba60362a 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundAdapterParserTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - import java.time.Duration; import java.util.HashMap; import java.util.Map; @@ -48,6 +43,11 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + /** * @author Soby Chacko * @author Artem Bilan diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundGatewayParserTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundGatewayParserTests.java index a2194c84ae..74d3ecbed5 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundGatewayParserTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.kafka.config.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; - import java.util.HashMap; import java.util.Map; @@ -38,6 +34,10 @@ import org.springframework.stereotype.Component; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Tom van den Berge @@ -60,11 +60,11 @@ public class KafkaOutboundGatewayParserTests { public void testProps() { assertThat(TestUtils.getPropertyValue(this.messageHandler, "errorMessageStrategy")).isInstanceOf(EMS.class); assertThat(TestUtils.getPropertyValue(this.messageHandler, "kafkaTemplate")) - .isSameAs(this.context.getBean("template")); + .isSameAs(this.context.getBean("template")); assertThat(this.messageHandler.getOrder()).isEqualTo(23); assertThat(TestUtils.getPropertyValue(this.messageHandler, "topicExpression.expression")).isEqualTo("'topic'"); assertThat(TestUtils.getPropertyValue(this.messageHandler, "messageKeyExpression.expression")) - .isEqualTo("'key'"); + .isEqualTo("'key'"); assertThat(TestUtils.getPropertyValue(this.messageHandler, "partitionIdExpression.expression")).isEqualTo("2"); assertThat(TestUtils.getPropertyValue(this.messageHandler, "sync", Boolean.class)).isTrue(); assertThat(TestUtils.getPropertyValue(this.messageHandler, "sendTimeoutExpression.expression")).isEqualTo("44"); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java index 18d680fb41..692ed10975 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/dsl/KafkaDslTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Collection; import java.util.Collections; @@ -85,6 +83,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.backoff.FixedBackOff; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Nasko Vasilev diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java index 29f8155914..58dca679ff 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/InboundGatewayTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.kafka.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.springframework.kafka.test.assertj.KafkaConditions.partition; -import static org.springframework.kafka.test.assertj.KafkaConditions.value; - import java.lang.reflect.Type; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -66,6 +61,11 @@ import org.springframework.retry.listener.RetryListenerSupport; import org.springframework.retry.policy.SimpleRetryPolicy; import org.springframework.retry.support.RetryTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.springframework.kafka.test.assertj.KafkaConditions.partition; +import static org.springframework.kafka.test.assertj.KafkaConditions.value; + /** * * @author Gary Russell @@ -76,13 +76,13 @@ import org.springframework.retry.support.RetryTemplate; * */ @EmbeddedKafka(controlledShutdown = true, - topics = { InboundGatewayTests.topic1, + topics = {InboundGatewayTests.topic1, InboundGatewayTests.topic2, InboundGatewayTests.topic3, InboundGatewayTests.topic4, InboundGatewayTests.topic5, InboundGatewayTests.topic6, - InboundGatewayTests.topic7 }) + InboundGatewayTests.topic7}) class InboundGatewayTests { static final String topic1 = "testTopic1"; diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java index 8cf746250f..443b2aea18 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageDrivenAdapterTests.java @@ -16,18 +16,6 @@ package org.springframework.integration.kafka.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.lang.reflect.Type; import java.time.Duration; import java.util.Arrays; @@ -99,6 +87,18 @@ import org.springframework.retry.listener.RetryListenerSupport; import org.springframework.retry.policy.SimpleRetryPolicy; import org.springframework.retry.support.RetryTemplate; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * * @author Gary Russell @@ -573,7 +573,7 @@ class MessageDrivenAdapterTests { pf.reset(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test void testPauseResume() throws Exception { ConsumerFactory cf = mock(ConsumerFactory.class); @@ -597,7 +597,7 @@ class MessageDrivenAdapterTests { }).given(consumer).commitSync(anyMap(), any()); given(consumer.assignment()).willReturn(records.keySet()); given(consumer.paused()).willReturn(records.keySet()); - TopicPartitionOffset[] topicPartition = { new TopicPartitionOffset("foo", 0) }; + TopicPartitionOffset[] topicPartition = {new TopicPartitionOffset("foo", 0)}; ContainerProperties containerProps = new ContainerProperties(topicPartition); containerProps.setAckMode(ContainerProperties.AckMode.RECORD); containerProps.setClientId("clientId"); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java index 2db404a6f2..dbcfeee857 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.kafka.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -38,6 +36,8 @@ import org.springframework.kafka.test.utils.KafkaTestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceTests.java index becd5e701c..9da40da9d4 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/inbound/MessageSourceTests.java @@ -16,22 +16,6 @@ package org.springframework.integration.kafka.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyCollection; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; - import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -86,6 +70,22 @@ import org.springframework.kafka.support.TopicPartitionOffset; import org.springframework.kafka.test.utils.KafkaTestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willDoNothing; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; + /** * @author Gary Russell @@ -97,7 +97,7 @@ import org.springframework.messaging.Message; */ class MessageSourceTests { - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testIllegalArgs() { ConsumerFactory consumerFactory = mock(ConsumerFactory.class); @@ -106,7 +106,7 @@ class MessageSourceTests { .hasMessage("topics, topicPattern, or topicPartitions must be provided"); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test void testConsumerAwareRebalanceListener() { Consumer consumer = mock(Consumer.class); @@ -156,7 +156,7 @@ class MessageSourceTests { assertThat(partitionsRevokedConsumer.get()).isEqualTo(consumer); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test void testRebalanceListener() { Consumer consumer = mock(Consumer.class); @@ -233,7 +233,7 @@ class MessageSourceTests { testAckCommon(false, false); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) private void testAckCommon(boolean sync, boolean timeout) { Consumer consumer = mock(Consumer.class); TopicPartition topicPartition = new TopicPartition("foo", 0); @@ -341,7 +341,7 @@ class MessageSourceTests { } } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) private void checkCommit(boolean sync, boolean timeout, Consumer consumer, TopicPartition topicPartition, OffsetCommitCallback commitCallback, InOrder inOrder, long offset) { @@ -363,7 +363,7 @@ class MessageSourceTests { } } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testAckOutOfOrder() { Consumer consumer = mock(Consumer.class); @@ -459,7 +459,7 @@ class MessageSourceTests { inOrder.verifyNoMoreInteractions(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testNack() { Consumer consumer = mock(Consumer.class); @@ -530,7 +530,7 @@ class MessageSourceTests { inOrder.verifyNoMoreInteractions(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testNackWithLaterInflight() { Consumer consumer = mock(Consumer.class); @@ -618,7 +618,7 @@ class MessageSourceTests { inOrder.verifyNoMoreInteractions(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testMaxPollRecords() { KafkaMessageSource source = new KafkaMessageSource(new DefaultKafkaConsumerFactory<>(Collections.emptyMap()), @@ -632,12 +632,13 @@ class MessageSourceTests { assertThatIllegalArgumentException() .isThrownBy(() -> - new KafkaMessageSource((new DefaultKafkaConsumerFactory(Collections.emptyMap()) { }), + new KafkaMessageSource((new DefaultKafkaConsumerFactory(Collections.emptyMap()) { + }), new ConsumerProperties("topic"))) .withMessageContaining(ConsumerConfig.MAX_POLL_RECORDS_CONFIG); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testPollTimeouts() { Consumer consumer = mock(Consumer.class); @@ -700,7 +701,7 @@ class MessageSourceTests { inOrder.verify(consumer).poll(Duration.of(20 * 5000, ChronoUnit.MILLIS)); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testAllowMulti() { Consumer consumer = mock(Consumer.class); @@ -830,7 +831,7 @@ class MessageSourceTests { source.destroy(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testStaticPartitionAssignment() { MockConsumer consumer = spy(new MockConsumer<>(OffsetResetStrategy.EARLIEST)); @@ -903,7 +904,7 @@ class MessageSourceTests { ConsumerRecord p5r2 = new ConsumerRecord<>("foo", 5, 2, null, "p5r2"); ConsumerRecord p5r3 = new ConsumerRecord<>("foo", 5, 3, null, "p5r3"); Arrays.asList(p0r0, p0r1, p0r2, p0r3, p1r0, p1r1, p1r2, p1r3, p2r0, p2r1, p2r2, p2r3, p3r0, p3r1, p3r2, p3r3, - p4r0, p4r1, p4r2, p4r3, p5r0, p5r1, p5r2, p5r3) + p4r0, p4r1, p4r2, p4r3, p5r0, p5r1, p5r2, p5r3) .forEach(consumer::addRecord); diff --git a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java index 49cb70341e..54759d6d85 100644 --- a/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java +++ b/spring-integration-kafka/src/test/java/org/springframework/integration/kafka/outbound/KafkaProducerMessageHandlerTests.java @@ -16,24 +16,6 @@ package org.springframework.integration.kafka.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.inOrder; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.springframework.kafka.test.assertj.KafkaConditions.key; -import static org.springframework.kafka.test.assertj.KafkaConditions.partition; -import static org.springframework.kafka.test.assertj.KafkaConditions.timestamp; -import static org.springframework.kafka.test.assertj.KafkaConditions.value; - import java.time.Duration; import java.util.Collection; import java.util.Collections; @@ -46,6 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import io.micrometer.observation.Observation; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerGroupMetadata; @@ -108,7 +91,23 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage import org.springframework.transaction.support.DefaultTransactionStatus; import org.springframework.transaction.support.TransactionTemplate; -import io.micrometer.observation.Observation; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.springframework.kafka.test.assertj.KafkaConditions.key; +import static org.springframework.kafka.test.assertj.KafkaConditions.partition; +import static org.springframework.kafka.test.assertj.KafkaConditions.timestamp; +import static org.springframework.kafka.test.assertj.KafkaConditions.value; /** * @author Gary Russell @@ -470,7 +469,7 @@ class KafkaProducerMessageHandlerTests { producerFactory.destroy(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testTransaction() { ProducerFactory pf = mock(ProducerFactory.class); @@ -492,7 +491,7 @@ class KafkaProducerMessageHandlerTests { inOrder.verify(producer).commitTransaction(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test void testConsumeAndProduceTransaction() throws Exception { Consumer mockConsumer = mock(Consumer.class); @@ -565,7 +564,7 @@ class KafkaProducerMessageHandlerTests { verifyNoMoreInteractions(producer); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testTransactionTxIdOverride() { Producer producer = mock(Producer.class); @@ -578,7 +577,6 @@ class KafkaProducerMessageHandlerTests { return producer; } - }; pf.setTransactionIdPrefix("default.tx.id."); willReturn(mock(Future.class)).given(producer).send(any(ProducerRecord.class), any(Callback.class)); @@ -598,7 +596,7 @@ class KafkaProducerMessageHandlerTests { assertThat(txId.get()).isEqualTo("overridden.tx.id."); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testTransactionSynch() { Producer producer = mock(Producer.class); @@ -628,7 +626,7 @@ class KafkaProducerMessageHandlerTests { verifyNoMoreInteractions(producer); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) @Test void testConsumeAndProduceTransactionTxIdOverride() throws Exception { Consumer mockConsumer = mock(Consumer.class); @@ -726,7 +724,7 @@ class KafkaProducerMessageHandlerTests { verify(template).send(any(ProducerRecord.class)); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testFlush() { ProducerFactory pf = mock(ProducerFactory.class); @@ -749,7 +747,7 @@ class KafkaProducerMessageHandlerTests { assertThat(captor.getValue().headers().lastHeader(KafkaIntegrationHeaders.FLUSH)).isNull(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void testNoFlush() { ProducerFactory pf = mock(ProducerFactory.class); @@ -769,7 +767,7 @@ class KafkaProducerMessageHandlerTests { handler.stop(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) @Test void conversion() { ProducerFactory pf = mock(ProducerFactory.class); diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java index 238dafd649..b9ad5cc4f1 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java @@ -27,7 +27,6 @@ import java.util.concurrent.ScheduledFuture; import jakarta.mail.Folder; import jakarta.mail.Message; import jakarta.mail.MessagingException; - import org.aopalliance.aop.Advice; import org.springframework.aop.framework.ProxyFactory; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java index acd2cab6e2..56f26da16e 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapMailReceiver.java @@ -22,6 +22,7 @@ import java.util.Objects; import java.util.Properties; import java.util.concurrent.ScheduledFuture; +import com.sun.mail.imap.IMAPFolder; import jakarta.mail.Flags; import jakarta.mail.Flags.Flag; import jakarta.mail.Folder; @@ -36,8 +37,6 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; -import com.sun.mail.imap.IMAPFolder; - /** * A {@link MailReceiver} implementation for receiving mail messages from a * mail server that supports the IMAP protocol. In addition to the pollable @@ -137,7 +136,7 @@ public class ImapMailReceiver extends AbstractMailReceiver { this.isInternalScheduler = true; } Properties javaMailProperties = getJavaMailProperties(); - for (String name : new String[]{ PROTOCOL, "imaps" }) { + for (String name : new String[] {PROTOCOL, "imaps"}) { String peek = "mail." + name + ".peek"; if (javaMailProperties.getProperty(peek) == null) { javaMailProperties.setProperty(peek, "true"); diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java index be37e8a19f..37811ea8d7 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,5 +61,4 @@ public final class MailHeaders { // empty } - } diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java index 4712f65391..ca112c7805 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailTransportUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2021 the original author or authors. + * Copyright 2007-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import jakarta.mail.Folder; import jakarta.mail.MessagingException; import jakarta.mail.Service; import jakarta.mail.URLName; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java index 03bc494309..5f256d35b3 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/dsl/ImapIdleChannelAdapterSpec.java @@ -29,7 +29,6 @@ import java.util.function.Function; import jakarta.mail.Authenticator; import jakarta.mail.Session; import jakarta.mail.internet.MimeMessage; - import org.aopalliance.aop.Advice; import org.springframework.expression.Expression; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java index 1872435b57..3d00907958 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java @@ -16,20 +16,6 @@ package org.springframework.integration.mail; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willDoNothing; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; @@ -45,6 +31,12 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.LogRecord; +import com.icegreen.greenmail.user.GreenMailUser; +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.GreenMailUtil; +import com.icegreen.greenmail.util.ServerSetup; +import com.icegreen.greenmail.util.ServerSetupTest; +import com.sun.mail.imap.IMAPFolder; import jakarta.mail.Flags; import jakarta.mail.Flags.Flag; import jakarta.mail.Folder; @@ -60,7 +52,6 @@ import jakarta.mail.internet.MimeMessage; import jakarta.mail.search.AndTerm; import jakarta.mail.search.FlagTerm; import jakarta.mail.search.FromTerm; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -89,12 +80,19 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.MimeTypeUtils; -import com.icegreen.greenmail.user.GreenMailUser; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.GreenMailUtil; -import com.icegreen.greenmail.util.ServerSetup; -import com.icegreen.greenmail.util.ServerSetupTest; -import com.sun.mail.imap.IMAPFolder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willDoNothing; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author Oleg Zhurakousky @@ -291,7 +289,7 @@ public class ImapMailReceiverTests { given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER)); folderField.set(receiver, folder); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; willAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock()); @@ -403,7 +401,7 @@ public class ImapMailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; willAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock()); int folderOpenMode = (int) accessor.getPropertyValue("folderOpenMode"); @@ -439,7 +437,7 @@ public class ImapMailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; willAnswer(invocation -> null).given(receiver).openFolder(); willAnswer(invocation -> messages).given(receiver).searchForNewMessages(); @@ -468,7 +466,7 @@ public class ImapMailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; willAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock()); int folderOpenMode = (int) accessor.getPropertyValue("folderOpenMode"); @@ -504,7 +502,7 @@ public class ImapMailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; willAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock()); int folderOpenMode = (int) accessor.getPropertyValue("folderOpenMode"); @@ -539,7 +537,7 @@ public class ImapMailReceiverTests { Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1")); Flags flags = mock(Flags.class); given(mailMessage.getFlags()).willReturn(flags); - final Message[] messages = new Message[]{ mailMessage }; + final Message[] messages = new Message[] {mailMessage}; willAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor((invocation.getMock())); @@ -607,7 +605,7 @@ public class ImapMailReceiverTests { Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1")); Flags flags = mock(Flags.class); given(mailMessage.getFlags()).willReturn(flags); - final Message[] messages = new Message[]{ mailMessage }; + final Message[] messages = new Message[] {mailMessage}; willAnswer(invocation -> messages).given(receiver).searchForNewMessages(); @@ -654,7 +652,7 @@ public class ImapMailReceiverTests { Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1")); Flags flags = mock(Flags.class); given(mailMessage.getFlags()).willReturn(flags); - final Message[] messages = new Message[]{ mailMessage }; + final Message[] messages = new Message[] {mailMessage}; final AtomicInteger shouldFindMessagesCounter = new AtomicInteger(2); willAnswer(invocation -> { @@ -727,7 +725,7 @@ public class ImapMailReceiverTests { Message mailMessage = spy(GreenMailUtil.newMimeMessage("test1")); Flags flags = mock(Flags.class); given(mailMessage.getFlags()).willReturn(flags); - final Message[] messages = new Message[]{ mailMessage }; + final Message[] messages = new Message[] {mailMessage}; willAnswer(invocation -> messages).given(receiver).searchForNewMessages(); @@ -783,7 +781,7 @@ public class ImapMailReceiverTests { Folder folder = mock(Folder.class); given(folder.exists()).willReturn(true); given(folder.isOpen()).willReturn(true); - given(folder.search(Mockito.any())).willReturn(new Message[]{ }); + given(folder.search(Mockito.any())).willReturn(new Message[] {}); given(store.getFolder(Mockito.any(URLName.class))).willReturn(folder); given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER)); @@ -865,7 +863,7 @@ public class ImapMailReceiverTests { given(folder.isOpen()).willReturn(true); Message message = GreenMailUtil.newMimeMessage(new ClassPathResource("test.mail").getInputStream()); - given(folder.search(Mockito.any())).willReturn(new Message[]{ message }); + given(folder.search(Mockito.any())).willReturn(new Message[] {message}); given(store.getFolder(Mockito.any(URLName.class))).willReturn(folder); given(folder.getPermanentFlags()).willReturn(new Flags(Flags.Flag.USER)); DirectFieldAccessor df = new DirectFieldAccessor(receiver); @@ -880,8 +878,8 @@ public class ImapMailReceiverTests { public void testNullMessages() throws Exception { Message message1 = spy(GreenMailUtil.newMimeMessage("test1")); Message message2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages1 = new Message[]{ null, null, message1 }; - final Message[] messages2 = new Message[]{ message2 }; + final Message[] messages1 = new Message[] {null, null, message1}; + final Message[] messages2 = new Message[] {message2}; final SearchTermStrategy searchTermStrategy = mock(SearchTermStrategy.class); class TestReceiver extends ImapMailReceiver { @@ -911,7 +909,6 @@ public class ImapMailReceiverTests { return messages; } - } ImapMailReceiver receiver = new TestReceiver(); Message[] received = (Message[]) receiver.receive(); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailSearchTermsTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailSearchTermsTests.java index c3e2e3eec6..376f80aff2 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailSearchTermsTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailSearchTermsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.mail; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -31,12 +27,15 @@ import jakarta.mail.search.AndTerm; import jakarta.mail.search.FlagTerm; import jakarta.mail.search.NotTerm; import jakarta.mail.search.SearchTerm; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceiverTests.java index 41b9544e14..4de6537ee1 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceiverTests.java @@ -16,6 +16,17 @@ package org.springframework.integration.mail; +import java.util.Properties; + +import jakarta.mail.Folder; +import jakarta.mail.Message; +import jakarta.mail.Session; +import jakarta.mail.Store; +import jakarta.mail.URLName; +import org.junit.jupiter.api.Test; + +import org.springframework.beans.DirectFieldAccessor; + import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.doNothing; @@ -26,18 +37,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Properties; - -import jakarta.mail.Folder; -import jakarta.mail.Message; -import jakarta.mail.Session; -import jakarta.mail.Store; -import jakarta.mail.URLName; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.DirectFieldAccessor; - /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java index 391c8ade08..ba4c153362 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailReceivingMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,17 +16,16 @@ package org.springframework.integration.mail; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import jakarta.mail.Message; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher @@ -43,9 +42,9 @@ public class MailReceivingMessageSourceTests { MimeMessage message3 = Mockito.mock(MimeMessage.class); MimeMessage message4 = Mockito.mock(MimeMessage.class); - mailReceiver.messages.add(new jakarta.mail.Message[]{ message1 }); - mailReceiver.messages.add(new jakarta.mail.Message[]{ message2, message3 }); - mailReceiver.messages.add(new jakarta.mail.Message[]{ message4 }); + mailReceiver.messages.add(new jakarta.mail.Message[] {message1}); + mailReceiver.messages.add(new jakarta.mail.Message[] {message2, message3}); + mailReceiver.messages.add(new jakarta.mail.Message[] {message4}); MailReceivingMessageSource source = new MailReceivingMessageSource(mailReceiver); assertThat(source.receive().getPayload()).as("Wrong message for number 1").isEqualTo(message1); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java index 89ff50d46f..b12b392015 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java @@ -16,15 +16,11 @@ package org.springframework.integration.mail; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.DataInputStream; import jakarta.mail.Message; import jakarta.mail.Multipart; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,6 +35,9 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Marius Bogoevici * @author Artem Bilan @@ -85,7 +84,7 @@ public class MailSendingMessageHandlerContextTests { @Test public void byteArrayMessage() throws Exception { - byte[] payload = { 1, 2, 3 }; + byte[] payload = {1, 2, 3}; org.springframework.messaging.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") @@ -110,7 +109,7 @@ public class MailSendingMessageHandlerContextTests { @Test public void byteArrayMessageWithoutAttachmentFileName() { - byte[] payload = { 1, 2, 3 }; + byte[] payload = {1, 2, 3}; assertThatExceptionOfType(MessageMappingException.class) .isThrownBy(() -> this.handler.handleMessage(new GenericMessage<>(payload))); } diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java index f1f9bd7ec8..970c38e127 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,12 @@ package org.springframework.integration.mail; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.DataInputStream; import jakarta.mail.Message; import jakarta.mail.Multipart; import jakarta.mail.Session; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,6 +29,8 @@ import org.junit.jupiter.api.Test; import org.springframework.integration.support.MessageBuilder; import org.springframework.mail.SimpleMailMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici * @author Oleg Zhurakousky @@ -69,7 +68,7 @@ public class MailSendingMessageHandlerTests { @Test public void byteArrayMessage() throws Exception { - byte[] payload = { 1, 2, 3 }; + byte[] payload = {1, 2, 3}; org.springframework.messaging.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") @@ -115,7 +114,7 @@ public class MailSendingMessageHandlerTests { SimpleMailMessage mailMessage = MailTestsHelper.createSimpleMailMessage(); mailMessage.getTo(); this.handler.handleMessage(MessageBuilder.withPayload(mailMessage) - .setHeader(MailHeaders.TO, new String[]{ "foo@bar.bam" }).build()); + .setHeader(MailHeaders.TO, new String[] {"foo@bar.bam"}).build()); assertThat(mailSender.getSentSimpleMailMessages().size()).as("only one simple message must be sent") .isEqualTo(1); SimpleMailMessage sentMessage = mailSender.getSentSimpleMailMessages().get(0); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java index f378126e00..30bd66acc5 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,13 +31,13 @@ public class MailTestsHelper { public static final String MESSAGE_TEXT = "Some text"; public static final String[] TO = new String[] { - "toRecipient1@springframework.org", "toRecipient2@springframework.org" }; + "toRecipient1@springframework.org", "toRecipient2@springframework.org"}; public static final String[] CC = new String[] { - "ccRecipient1@springframework.org", "ccRecipient2@springframework.org" }; + "ccRecipient1@springframework.org", "ccRecipient2@springframework.org"}; public static final String[] BCC = new String[] { - "bccRecipient1@springframework.org", "bccRecipient2@springframework.org" }; + "bccRecipient1@springframework.org", "bccRecipient2@springframework.org"}; public static final String FROM = "from@springframework.org"; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java index 0d1436f67c..f71bf76f93 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/Pop3MailReceiverTests.java @@ -16,6 +16,18 @@ package org.springframework.integration.mail; +import java.lang.reflect.Field; + +import com.icegreen.greenmail.util.GreenMailUtil; +import jakarta.mail.Flags; +import jakarta.mail.Flags.Flag; +import jakarta.mail.Folder; +import jakarta.mail.Message; +import org.junit.jupiter.api.Test; + +import org.springframework.beans.DirectFieldAccessor; +import org.springframework.beans.factory.BeanFactory; + import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -23,20 +35,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.lang.reflect.Field; - -import jakarta.mail.Flags; -import jakarta.mail.Flags.Flag; -import jakarta.mail.Folder; -import jakarta.mail.Message; - -import org.junit.jupiter.api.Test; - -import org.springframework.beans.DirectFieldAccessor; -import org.springframework.beans.factory.BeanFactory; - -import com.icegreen.greenmail.util.GreenMailUtil; - /** * @author Oleg Zhurakousky * @author Gary Russell @@ -61,7 +59,7 @@ public class Pop3MailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; doAnswer(invocation -> { DirectFieldAccessor accessor = new DirectFieldAccessor(invocation.getMock()); int folderOpenMode = (Integer) accessor.getPropertyValue("folderOpenMode"); @@ -96,7 +94,7 @@ public class Pop3MailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; doAnswer(invocation -> null).when(receiver).openFolder(); doAnswer(invocation -> messages).when(receiver).searchForNewMessages(); @@ -123,7 +121,7 @@ public class Pop3MailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; doAnswer(invocation -> null).when(receiver).openFolder(); doAnswer(invocation -> messages).when(receiver).searchForNewMessages(); @@ -150,7 +148,7 @@ public class Pop3MailReceiverTests { Message msg1 = spy(GreenMailUtil.newMimeMessage("test1")); Message msg2 = spy(GreenMailUtil.newMimeMessage("test2")); - final Message[] messages = new Message[]{ msg1, msg2 }; + final Message[] messages = new Message[] {msg1, msg2}; doAnswer(invocation -> null).when(receiver).openFolder(); doAnswer(invocation -> messages).when(receiver).searchForNewMessages(); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests.java index c56ac0020d..7588c29a1b 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +30,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java index 44da27bdf7..cc6eac90d7 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/FailedMailConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java index a27994a9ad..2de5d3edfe 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,12 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import jakarta.mail.Flags; import jakarta.mail.Folder; import jakarta.mail.URLName; import jakarta.mail.search.SearchTerm; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -39,6 +36,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleIntegrationTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleIntegrationTests.java index f0960c622b..f7bdc113ae 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleIntegrationTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.lang.reflect.Field; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -31,7 +23,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import jakarta.mail.Folder; import jakarta.mail.Message; - import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -40,6 +31,14 @@ import org.springframework.integration.mail.ImapMailReceiver; import org.springframework.integration.test.util.TestUtils; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Artem Bilan @@ -71,7 +70,7 @@ public class ImapIdleIntegrationTests { }).when(receiver).waitForNewMessages(); Message m1 = mock(Message.class); - doReturn(new Message[]{ m1 }).when(receiver).receive(); + doReturn(new Message[] {m1}).when(receiver).receive(); Folder folder = mock(Folder.class); when(folder.isOpen()).thenReturn(true); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java index ea4c9e7b96..93665f262d 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java @@ -16,11 +16,7 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import jakarta.mail.Authenticator; - import org.junit.jupiter.api.Test; import org.xml.sax.SAXParseException; @@ -42,6 +38,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java index 3779efc087..8e4732ee51 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -32,6 +30,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java index 97003996e4..8aaa4375bc 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import org.junit.jupiter.api.Test; @@ -35,6 +33,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java index 2bf02ea50a..2f8c0404d9 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,7 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -32,6 +28,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java index 5e22f744ce..aea2eae5ca 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,12 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.FileReader; import java.io.StringWriter; import java.util.Properties; import jakarta.mail.Session; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -45,6 +37,13 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java index 4acf940933..453f6e50fb 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/PollingMailSourceParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,9 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Properties; import jakarta.mail.URLName; - import org.junit.jupiter.api.Test; import org.springframework.beans.DirectFieldAccessor; @@ -33,6 +30,8 @@ import org.springframework.integration.mail.MailReceivingMessageSource; import org.springframework.integration.mail.Pop3MailReceiver; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/Pop3Tests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/Pop3Tests.java index 18adcdc2ba..85aca57b4c 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/Pop3Tests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/Pop3Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,16 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; +import com.icegreen.greenmail.user.GreenMailUser; +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.GreenMailUtil; +import com.icegreen.greenmail.util.ServerSetup; +import com.icegreen.greenmail.util.ServerSetupTest; import jakarta.mail.Message.RecipientType; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -35,11 +37,7 @@ import org.springframework.integration.mail.support.DefaultMailHeaderMapper; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; -import com.icegreen.greenmail.user.GreenMailUser; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.GreenMailUtil; -import com.icegreen.greenmail.util.ServerSetup; -import com.icegreen.greenmail.util.ServerSetupTest; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java index 36f0a06aae..450b3fe4ca 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.mail.config; -import static org.assertj.core.api.Assertions.assertThat; - +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; +import com.icegreen.greenmail.util.ServerSetupTest; import jakarta.mail.Message.RecipientType; import jakarta.mail.internet.InternetAddress; import jakarta.mail.internet.MimeMessage; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -31,9 +31,7 @@ import org.springframework.integration.mail.MailSendingMessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.mail.javamail.JavaMailSenderImpl; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.ServerSetup; -import com.icegreen.greenmail.util.ServerSetupTest; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell @@ -71,7 +69,7 @@ public class SmtpTests { MailSendingMessageHandler handler = new MailSendingMessageHandler(mailSender); handler.handleMessage(MessageBuilder.withPayload("foo") - .setHeader(MailHeaders.TO, new String[]{ "bar@baz" }) + .setHeader(MailHeaders.TO, new String[] {"bar@baz"}) .setHeader(MailHeaders.FROM, "foo@bar") .setHeader(MailHeaders.SUBJECT, "foo") .build()); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java index 580d11d99c..ac0db77fe8 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java @@ -16,11 +16,13 @@ package org.springframework.integration.mail.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.Closeable; import java.util.Properties; +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.GreenMailUtil; +import com.icegreen.greenmail.util.ServerSetup; +import com.icegreen.greenmail.util.ServerSetupTest; import jakarta.mail.Flags; import jakarta.mail.Folder; import jakarta.mail.internet.AddressException; @@ -31,7 +33,6 @@ import jakarta.mail.search.AndTerm; import jakarta.mail.search.FlagTerm; import jakarta.mail.search.FromTerm; import jakarta.mail.search.SearchTerm; - import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -58,10 +59,7 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.GreenMailUtil; -import com.icegreen.greenmail.util.ServerSetup; -import com.icegreen.greenmail.util.ServerSetupTest; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell @@ -82,7 +80,7 @@ public class MailTests { imap.setServerStartupTimeout(10000); ServerSetup pop3 = ServerSetupTest.POP3.dynamicPort(); pop3.setServerStartupTimeout(10000); - mailServer = new GreenMail(new ServerSetup[]{ smtp, pop3, imap }); + mailServer = new GreenMail(new ServerSetup[] {smtp, pop3, imap}); mailServer.setUser("bar@baz", "smtpuser", "pw"); mailServer.setUser("popuser", "pw"); mailServer.setUser("imapuser", "pw"); @@ -206,7 +204,7 @@ public class MailTests { .enrichHeaders(Mail.headers() .subjectFunction(m -> "foo") .from("foo@bar") - .toFunction(m -> new String[]{ "bar@baz" })) + .toFunction(m -> new String[] {"bar@baz"})) .handle(Mail.outboundAdapter("localhost") .port(mailServer.getSmtp().getPort()) .credentials("smtpuser", "pw") diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java index a66595385b..4b9bf81a14 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2021 the original author or authors. + * Copyright 2007-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser; import org.springframework.integration.mongodb.outbound.MongoDbStoringMessageHandler; + /** * Parser for Mongodb store outbound adapters. * diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParser.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParser.java index fdd6a2cce9..1aec4e9f4a 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParser.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ public class MongoDbOutboundGatewayParser extends AbstractConsumerEndpointParser if (StringUtils.hasText(collectionCallback)) { if (StringUtils.hasText(element.getAttribute("query")) || - StringUtils.hasText(element.getAttribute("query-expression"))) { + StringUtils.hasText(element.getAttribute("query-expression"))) { parserContext.getReaderContext() .error("'collection-callback' is not allowed with 'query' or 'query-expression'", element); diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/AbstractMongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/AbstractMongoDbMessageSource.java index 418c3c6760..fae39b04bc 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/AbstractMongoDbMessageSource.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/AbstractMongoDbMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 the original author or authors. + * Copyright 2021-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ package org.springframework.integration.mongodb.inbound; import java.util.Collection; import java.util.Map; +import com.mongodb.DBObject; import org.bson.Document; import org.springframework.beans.BeansException; @@ -44,8 +45,6 @@ import org.springframework.util.Assert; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import com.mongodb.DBObject; - /** * An {@link AbstractMessageSource} extension for common MongoDB sources options and support methods. * diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducer.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducer.java index e5e249e2b7..a7b0a482f6 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducer.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package org.springframework.integration.mongodb.inbound; import org.bson.Document; +import reactor.core.publisher.Flux; import org.springframework.data.mongodb.core.ChangeStreamOptions; import org.springframework.data.mongodb.core.ReactiveMongoOperations; @@ -27,8 +28,6 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import reactor.core.publisher.Flux; - /** * A {@link MessageProducerSupport} for MongoDB Change Stream implementation. * The functionality is based on the diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java index 28e1213f16..969a4517c7 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2021 the original author or authors. + * Copyright 2007-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -173,5 +173,4 @@ public class MongoDbMessageSource extends AbstractMongoDbMessageSource { } } - } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSource.java index f4637877c9..0f19783386 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSource.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ package org.springframework.integration.mongodb.inbound; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.context.ApplicationContext; import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory; @@ -31,9 +33,6 @@ import org.springframework.integration.mongodb.support.MongoHeaders; import org.springframework.lang.Nullable; import org.springframework.util.Assert; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * An instance of {@link org.springframework.integration.core.MessageSource} which returns * a {@link org.springframework.messaging.Message} with a payload which is the result of diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MessageCollectionCallback.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MessageCollectionCallback.java index 8ce0726c91..6546a966d1 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MessageCollectionCallback.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MessageCollectionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2021 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.mongodb.outbound; +import com.mongodb.MongoException; +import com.mongodb.client.MongoCollection; import org.bson.Document; import org.springframework.dao.DataAccessException; @@ -23,9 +25,6 @@ import org.springframework.data.mongodb.core.CollectionCallback; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import com.mongodb.MongoException; -import com.mongodb.client.MongoCollection; - /** * The callback to be used with the {@link MongoDbOutboundGateway} * as an alternative to other query options on the gateway. diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java index bca3eedf37..491a60c051 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2021 the original author or authors. + * Copyright 2007-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.messaging.Message; import org.springframework.util.Assert; + /** * Implementation of {@link org.springframework.messaging.MessageHandler} * which writes Message payload into a MongoDb collection @@ -103,7 +104,7 @@ public class MongoDbStoringMessageHandler extends AbstractMessageHandler { @Override protected void onInit() { this.evaluationContext = - ExpressionUtils.createStandardEvaluationContext(this.getBeanFactory()); + ExpressionUtils.createStandardEvaluationContext(this.getBeanFactory()); if (this.mongoTemplate == null) { this.mongoTemplate = new MongoTemplate(this.mongoDbFactory, this.mongoConverter); } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java index b21a15036b..349f1b56d9 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.mongodb.outbound; +import reactor.core.publisher.Mono; + import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory; import org.springframework.data.mongodb.core.ReactiveMongoOperations; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; @@ -28,8 +30,6 @@ import org.springframework.integration.handler.AbstractReactiveMessageHandler; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * Implementation of {@link org.springframework.messaging.ReactiveMessageHandler} which writes * Message payload into a MongoDb collection, using reactive MongoDb support, The diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java index 3916ee831d..fc2870897a 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -204,9 +204,9 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractMe Query query = Query.query(Criteria.where("_id").is(SEQUENCE_NAME)); query.fields().include(MessageDocumentFields.SEQUENCE); return ((Number) this.mongoTemplate.findAndModify(query, - new Update().inc(MessageDocumentFields.SEQUENCE, 1L), - FindAndModifyOptions.options().returnNew(true).upsert(true), - Map.class, this.collectionName) + new Update().inc(MessageDocumentFields.SEQUENCE, 1L), + FindAndModifyOptions.options().returnNew(true).upsert(true), + Map.class, this.collectionName) .get(MessageDocumentFields.SEQUENCE)) // NOSONAR - never returns null .longValue(); } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java index f62cfbe3d4..9696ffa387 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java @@ -30,6 +30,8 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.mongodb.BasicDBList; +import com.mongodb.DBObject; import org.bson.Document; import org.bson.conversions.Bson; import org.bson.types.Binary; @@ -83,9 +85,6 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import com.mongodb.BasicDBList; -import com.mongodb.DBObject; - /** * An implementation of both the {@link MessageStore} and @@ -584,7 +583,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore } @Override - @SuppressWarnings({ UNCHECKED }) + @SuppressWarnings({UNCHECKED}) public S read(Class clazz, Bson source) { if (!MessageWrapper.class.equals(clazz)) { return super.read(clazz, source); @@ -640,7 +639,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore } @Override - @SuppressWarnings({ UNCHECKED }) + @SuppressWarnings({UNCHECKED}) protected S read(TypeInformation type, Bson source) { if (!MessageWrapper.class.equals(type.getType())) { return super.read(type, source); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java index 640bd7b91a..49df0d6d2d 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/MongoDbContainerTest.java @@ -18,6 +18,11 @@ package org.springframework.integration.mongodb; import java.time.Duration; +import com.mongodb.ConnectionString; +import com.mongodb.MongoClientSettings; +import com.mongodb.MongoException; +import com.mongodb.client.MongoClients; +import com.mongodb.client.MongoCollection; import org.bson.Document; import org.bson.UuidRepresentation; import org.bson.conversions.Bson; @@ -42,12 +47,6 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; import org.springframework.integration.mongodb.outbound.MessageCollectionCallback; import org.springframework.messaging.Message; -import com.mongodb.ConnectionString; -import com.mongodb.MongoClientSettings; -import com.mongodb.MongoException; -import com.mongodb.client.MongoClients; -import com.mongodb.client.MongoCollection; - /** * The base contract for all tests requiring a MongoDb connection. * The Testcontainers 'reuse' option must be disabled, so, Ryuk container is started diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java index 3b7b17669f..64a1cf6d33 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java @@ -16,11 +16,9 @@ package org.springframework.integration.mongodb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.List; +import com.mongodb.BasicDBObject; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +37,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.mongodb.BasicDBObject; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * @author Oleg Zhurakousky diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests.java index 325f63d7bb..5b6ffe31fa 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.mongodb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +33,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java index e695ec50e2..052eae1bd9 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java @@ -16,8 +16,7 @@ package org.springframework.integration.mongodb.config; -import static org.assertj.core.api.Assertions.assertThat; - +import com.mongodb.BasicDBObject; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; -import com.mongodb.BasicDBObject; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Oleg Zhurakousky diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java index 9ed02e16fc..ac4e10df02 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.mongodb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; @@ -37,6 +34,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageHandler; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests.java index d4ee5eb4ca..052518e7c4 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.mongodb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.List; import org.junit.jupiter.api.Test; @@ -41,6 +38,9 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Xavier Padro * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java index 2133395f4c..4b419fdd42 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.mongodb.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -57,6 +53,10 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.awaitility.Awaitility.await; + /** * @author Xavier Padro * @author Gary Russell diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducerTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducerTests.java index 30ad38ec90..49e3693cdf 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducerTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbChangeStreamMessageProducerTests.java @@ -16,10 +16,11 @@ package org.springframework.integration.mongodb.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; +import com.mongodb.client.model.changestream.OperationType; +import com.mongodb.reactivestreams.client.MongoClient; +import com.mongodb.reactivestreams.client.MongoClients; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -27,6 +28,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -45,11 +48,7 @@ import org.springframework.integration.mongodb.support.MongoHeaders; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.mongodb.client.model.changestream.OperationType; -import com.mongodb.reactivestreams.client.MongoClient; -import com.mongodb.reactivestreams.client.MongoClients; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -134,8 +133,8 @@ public class MongoDbChangeStreamMessageProducerTests { .verifyLater(); Flux.concat(this.mongoTemplate.insert(person1), - this.mongoTemplate.insert(person2), - this.mongoTemplate.insert(person3)) + this.mongoTemplate.insert(person2), + this.mongoTemplate.insert(person3)) .as(StepVerifier::create) .expectNextCount(3) .verifyComplete(); @@ -157,12 +156,12 @@ public class MongoDbChangeStreamMessageProducerTests { @Bean IntegrationFlow changeStreamFlow() { return IntegrationFlow.from( - MongoDb.changeStreamInboundChannelAdapter(mongoTemplate()) - .domainType(Person.class) - .collection("person") - .extractBody(false) - .autoStartup(false) - .shouldTrack(true)) + MongoDb.changeStreamInboundChannelAdapter(mongoTemplate()) + .domainType(Person.class) + .collection("person") + .extractBody(false) + .autoStartup(false) + .shouldTrack(true)) .channel(MessageChannels.flux()) .get(); } diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java index c87db615c1..8c0617948d 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java @@ -16,15 +16,9 @@ package org.springframework.integration.mongodb.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.List; +import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,7 +36,12 @@ import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.mongodb.MongoDbContainerTest; -import com.mongodb.BasicDBObject; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Amol Nayak diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSourceTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSourceTests.java index 4605d1f8cb..c6e4c43584 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSourceTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/ReactiveMongoDbMessageSourceTests.java @@ -16,24 +16,21 @@ package org.springframework.integration.mongodb.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; +import com.mongodb.BasicDBObject; import org.bson.conversions.Bson; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ConfigurableApplicationContext; @@ -55,10 +52,12 @@ import org.springframework.integration.dsl.Pollers; import org.springframework.integration.mongodb.MongoDbContainerTest; import org.springframework.integration.mongodb.dsl.MongoDb; -import com.mongodb.BasicDBObject; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author David Turanski diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java index 635ce559d1..dfecc93c8d 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.metadata; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,6 +24,8 @@ import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.integration.mongodb.MongoDbContainerTest; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Senthil Arumugam, Samiraj Panneer Selvam * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java index 14a65edbf4..49c84c88a0 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.mongodb.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.fail; - import java.util.Arrays; import java.util.List; import java.util.function.Function; @@ -48,6 +44,10 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.fail; + /** * @author Xavier Padro * @author Gary Rssell diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java index f7eaf9aa27..06f10887bb 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.jupiter.api.AfterEach; @@ -37,6 +35,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Xavier Padro * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java index bdd073e612..93984736af 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java @@ -16,13 +16,6 @@ package org.springframework.integration.mongodb.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.bson.conversions.Bson; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -42,6 +35,13 @@ import org.springframework.integration.mongodb.MongoDbContainerTest; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Amol Nayak * @author Oleg Zhurakousky diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandlerTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandlerTests.java index 060d6e3a0b..9de3d71d24 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandlerTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandlerTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.mongodb.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.time.Duration; import java.util.concurrent.atomic.AtomicBoolean; @@ -29,6 +23,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Answers; +import reactor.core.publisher.Mono; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -48,7 +43,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; /** * @author Amol Nayak diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java index 3a28779495..a0bea43a87 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -49,6 +47,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java index d3e38feabd..7a183efdce 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.Serializable; import java.util.Properties; import java.util.UUID; @@ -44,6 +42,8 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Mark Fisher diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageGroupStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageGroupStoreTests.java index 7a966a17eb..62e2453e5f 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageGroupStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageGroupStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.bson.Document; @@ -38,6 +36,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.StopWatch; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Amol Nayak * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java index cf76985872..b268fb85c9 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Iterator; import java.util.concurrent.TimeUnit; @@ -37,6 +35,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Artem Vozhdayenko diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java index 6e56816b75..151af452b9 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.Serializable; import org.junit.jupiter.api.AfterEach; @@ -34,6 +32,8 @@ import org.springframework.integration.transformer.ClaimCheckInTransformer; import org.springframework.integration.transformer.ClaimCheckOutTransformer; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java index 5e4a2cec73..6445b8fab8 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mongodb.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -28,6 +26,8 @@ import org.springframework.data.convert.WritingConverter; import org.springframework.integration.store.MessageStore; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java index 3966a94d38..8449063229 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ public class MqttNamespaceHandler extends AbstractIntegrationNamespaceHandler { @Override public void init() { - this.registerBeanDefinitionParser("message-driven-channel-adapter", new MqttMessageDrivenChannelAdapterParser()); + this.registerBeanDefinitionParser("message-driven-channel-adapter", new MqttMessageDrivenChannelAdapterParser()); this.registerBeanDefinitionParser("outbound-channel-adapter", new MqttOutboundChannelAdapterParser()); } diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java index 6642f7ff59..dd073eedb2 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java @@ -66,7 +66,7 @@ public class Mqttv3ClientManager private static MqttConnectOptions buildDefaultConnectionOptions(String url) { Assert.notNull(url, "'url' is required"); MqttConnectOptions connectOptions = new MqttConnectOptions(); - connectOptions.setServerURIs(new String[]{ url }); + connectOptions.setServerURIs(new String[] {url}); connectOptions.setAutomaticReconnect(true); return connectOptions; } diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java index d9433a992c..d709431d16 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java @@ -70,7 +70,7 @@ public class Mqttv5ClientManager private static MqttConnectionOptions buildDefaultConnectionOptions(String url) { Assert.notNull(url, "'url' is required"); var connectionOptions = new MqttConnectionOptions(); - connectionOptions.setServerURIs(new String[]{ url }); + connectionOptions.setServerURIs(new String[] {url}); connectionOptions.setAutomaticReconnect(true); return connectionOptions; } diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java index 532b815c6e..3bf3166758 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package org.springframework.integration.mqtt.event; - /** * An event emitted (when using aysnc) when the client indicates the message * was delivered. diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java index ea1c3b1955..c41b84aacb 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java @@ -155,7 +155,7 @@ public class MqttPahoMessageDrivenChannelAdapter String url = getUrl(); if (url != null) { options = MqttUtils.cloneConnectOptions(options); - options.setServerURIs(new String[]{ url }); + options.setServerURIs(new String[] {url}); } } return options; diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java index 4a68800191..53bc640088 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java @@ -97,7 +97,7 @@ public class Mqttv5PahoMessageDrivenChannelAdapter super(url, clientId, topic); Assert.hasText(url, "'url' cannot be null or empty"); this.connectionOptions = new MqttConnectionOptions(); - this.connectionOptions.setServerURIs(new String[]{ url }); + this.connectionOptions.setServerURIs(new String[] {url}); this.connectionOptions.setAutomaticReconnect(true); } diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java index 4fa3802b99..a9d5f3ab7f 100644 --- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java +++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java @@ -142,7 +142,7 @@ public class MqttPahoMessageHandler extends AbstractMqttMessageHandler { private static final LogAccessor LOGGER = new LogAccessor(MqttHeaderMapper.class); - private String[] inboundHeaderNames = { "*" }; + private String[] inboundHeaderNames = {"*"}; private String[] outboundHeaderNames = { MessageHeaders.CONTENT_TYPE, diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java index fb6e78be7d..93f7b1be96 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.File; import java.util.Collections; import java.util.concurrent.CountDownLatch; @@ -61,6 +56,11 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -208,7 +208,7 @@ public class BackToBackAdapterTests implements MosquittoContainerTest { inbound.addTopic("mqqt-bar", "mqqt-baz"); inbound.removeTopic("mqqt-bar", "mqqt-baz"); - inbound.addTopics(new String[]{ "mqqt-bar", "mqqt-baz" }, new int[]{ 0, 0 }); + inbound.addTopics(new String[] {"mqqt-bar", "mqqt-baz"}, new int[] {0, 0}); inbound.removeTopic("mqqt-bar", "mqqt-baz"); adapter.stop(); diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java index 73c322be94..d745fed94a 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,6 +43,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Vozhdayenko * @author Artem Bilan @@ -117,7 +117,7 @@ class ClientManagerBackToBackTests implements MosquittoContainerTest { @Bean public Mqttv3ClientManager mqttv3ClientManager() { MqttConnectOptions connectionOptions = new MqttConnectOptions(); - connectionOptions.setServerURIs(new String[]{ MosquittoContainerTest.mqttUrl() }); + connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()}); connectionOptions.setAutomaticReconnect(true); return new Mqttv3ClientManager(connectionOptions, "client-manager-client-id-v3"); } @@ -157,7 +157,7 @@ class ClientManagerBackToBackTests implements MosquittoContainerTest { @Bean public Mqttv3ClientManager mqttv3ClientManager() { MqttConnectOptions connectionOptions = new MqttConnectOptions(); - connectionOptions.setServerURIs(new String[]{ MosquittoContainerTest.mqttUrl() }); + connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()}); connectionOptions.setAutomaticReconnect(true); return new Mqttv3ClientManager(connectionOptions, "client-manager-client-id-v3-reconnect"); } diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java index 994a86f3f4..266af75eef 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; @@ -43,6 +36,13 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java index 138c81ddd0..724a352bba 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java @@ -16,24 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.lang.reflect.Method; import java.util.Properties; import java.util.concurrent.BlockingQueue; @@ -91,6 +73,24 @@ import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan @@ -232,7 +232,7 @@ public class MqttAdapterTests { given(clientManager.getClient()).willReturn(client); var subscribeToken = mock(MqttToken.class); - given(subscribeToken.getGrantedQos()).willReturn(new int[]{ 2 }); + given(subscribeToken.getGrantedQos()).willReturn(new int[] {2}); given(client.subscribe(any(String[].class), any(int[].class), any())) .willReturn(subscribeToken); @@ -247,8 +247,8 @@ public class MqttAdapterTests { // then verify(client, never()).connect(any(MqttConnectOptions.class)); - verify(client).subscribe(eq(new String[]{ "mqtt-foo" }), any(int[].class), any()); - verify(client).unsubscribe(new String[]{ "mqtt-foo" }); + verify(client).subscribe(eq(new String[] {"mqtt-foo"}), any(int[].class), any()); + verify(client).unsubscribe(new String[] {"mqtt-foo"}); verify(client, never()).disconnect(); verify(client, never()).disconnect(anyLong()); verify(client, never()).close(); @@ -293,7 +293,7 @@ public class MqttAdapterTests { return token; }).given(client).connect(any(MqttConnectOptions.class)); given(client.subscribe(any(String[].class), any(int[].class), any())).willReturn(token); - given(token.getGrantedQos()).willReturn(new int[]{ 2 }); + given(token.getGrantedQos()).willReturn(new int[] {2}); final AtomicReference callback = new AtomicReference<>(); willAnswer(invocation -> { @@ -460,7 +460,7 @@ public class MqttAdapterTests { willReturn(alwaysComplete).given(client).connect(any(MqttConnectOptions.class)); IMqttToken token = mock(IMqttToken.class); - given(token.getGrantedQos()).willReturn(new int[]{ 0x80 }); + given(token.getGrantedQos()).willReturn(new int[] {0x80}); willReturn(token).given(client).subscribe(any(String[].class), any(int[].class), any()); MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("foo", "bar", factory, @@ -507,7 +507,7 @@ public class MqttAdapterTests { willReturn(alwaysComplete).given(client).connect(any(MqttConnectOptions.class)); IMqttToken token = mock(IMqttToken.class); - given(token.getGrantedQos()).willReturn(new int[]{ 2, 0 }); + given(token.getGrantedQos()).willReturn(new int[] {2, 0}); willReturn(token).given(client).subscribe(any(String[].class), any(int[].class), any()); MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("foo", "bar", factory, @@ -551,7 +551,7 @@ public class MqttAdapterTests { }; MqttConnectOptions connectOptions = new MqttConnectOptions(); - connectOptions.setServerURIs(new String[]{ "tcp://localhost:1883" }); + connectOptions.setServerURIs(new String[] {"tcp://localhost:1883"}); if (cleanSession != null) { connectOptions.setCleanSession(cleanSession); } @@ -563,7 +563,7 @@ public class MqttAdapterTests { IMqttToken token = mock(IMqttToken.class); given(client.connect(any(MqttConnectOptions.class))).willReturn(token); given(client.subscribe(any(String[].class), any(int[].class), any())).willReturn(token); - given(token.getGrantedQos()).willReturn(new int[]{ 2 }); + given(token.getGrantedQos()).willReturn(new int[] {2}); MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("client", factory, "foo"); adapter.setApplicationEventPublisher(mock(ApplicationEventPublisher.class)); adapter.setOutputChannel(new NullChannel()); @@ -581,7 +581,7 @@ public class MqttAdapterTests { }; MqttConnectOptions connectOptions = new MqttConnectOptions(); - connectOptions.setServerURIs(new String[]{ "tcp://localhost:1883" }); + connectOptions.setServerURIs(new String[] {"tcp://localhost:1883"}); factory.setConnectionOptions(connectOptions); MqttPahoMessageHandler adapter = new MqttPahoMessageHandler("client", factory); adapter.setDefaultTopic("foo"); diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java index 14d46c4423..ed03487fbf 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import javax.management.MBeanServer; @@ -46,6 +44,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -101,7 +101,7 @@ public class MqttDslTests implements MosquittoContainerTest { public DefaultMqttPahoClientFactory pahoClientFactory() { DefaultMqttPahoClientFactory pahoClientFactory = new DefaultMqttPahoClientFactory(); MqttConnectOptions connectionOptions = new MqttConnectOptions(); - connectionOptions.setServerURIs(new String[]{ MosquittoContainerTest.mqttUrl() }); + connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()}); pahoClientFactory.setConnectionOptions(connectionOptions); return pahoClientFactory; } diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java index 266eae5bb0..d04b2be822 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.net.UnknownHostException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -47,6 +44,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Lucas Bowler @@ -83,7 +83,7 @@ public class Mqttv5BackToBackAutomaticReconnectTests implements MosquittoContain .withCauseExactlyInstanceOf(MqttException.class) .withRootCauseExactlyInstanceOf(UnknownHostException.class); - connectionOptions.setServerURIs(new String[]{ MosquittoContainerTest.mqttUrl() }); + connectionOptions.setServerURIs(new String[] {MosquittoContainerTest.mqttUrl()}); assertThat(this.config.subscribeLatch.await(10, TimeUnit.SECONDS)).isTrue(); diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java index a8160a03b9..427ec5efbe 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mqtt; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -52,6 +50,8 @@ import org.springframework.messaging.converter.SmartMessageConverter; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java index bf45b5b507..e4746ca18b 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.mqtt.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java index a3ef9da849..347e284533 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.mqtt.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; @@ -37,6 +35,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSource.java b/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSource.java index cea52b5d33..c4669496a6 100644 --- a/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSource.java +++ b/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,10 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.function.Supplier; +import io.r2dbc.spi.Row; +import io.r2dbc.spi.RowMetadata; import org.reactivestreams.Publisher; +import reactor.core.publisher.Mono; import org.springframework.data.r2dbc.convert.EntityRowMapper; import org.springframework.data.r2dbc.core.R2dbcEntityOperations; @@ -36,10 +39,6 @@ import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.r2dbc.core.RowsFetchSpec; import org.springframework.util.Assert; -import io.r2dbc.spi.Row; -import io.r2dbc.spi.RowMetadata; -import reactor.core.publisher.Mono; - /** * An instance of {@link org.springframework.integration.core.MessageSource} which returns @@ -186,7 +185,7 @@ public class R2dbcMessageSource extends AbstractMessageSource> { Assert.isTrue(this.initialized, "This class is not yet initialized. Invoke its afterPropertiesSet() method"); Mono> queryMono = Mono.fromSupplier(() -> - this.queryExpression.getValue(this.evaluationContext, this.selectCreator)) + this.queryExpression.getValue(this.evaluationContext, this.selectCreator)) .map(this::prepareFetch); if (this.expectSingleResult) { return queryMono.flatMap(RowsFetchSpec::one) diff --git a/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java b/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java index b5885392ab..f7b7a08774 100644 --- a/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java +++ b/spring-integration-r2dbc/src/main/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandler.java @@ -19,6 +19,8 @@ package org.springframework.integration.r2dbc.outbound; import java.util.HashMap; import java.util.Map; +import reactor.core.publisher.Mono; + import org.springframework.data.r2dbc.core.R2dbcEntityOperations; import org.springframework.data.r2dbc.core.StatementMapper; import org.springframework.data.relational.core.query.Criteria; @@ -38,8 +40,6 @@ import org.springframework.r2dbc.core.Parameter; import org.springframework.r2dbc.core.PreparedOperation; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * Implementation of {@link org.springframework.messaging.ReactiveMessageHandler} which writes diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/config/R2dbcDatabaseConfiguration.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/config/R2dbcDatabaseConfiguration.java index 57be0c84bd..4c904f9367 100644 --- a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/config/R2dbcDatabaseConfiguration.java +++ b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/config/R2dbcDatabaseConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,10 @@ package org.springframework.integration.r2dbc.config; +import io.r2dbc.h2.H2ConnectionConfiguration; +import io.r2dbc.h2.H2ConnectionFactory; +import io.r2dbc.spi.ConnectionFactory; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; @@ -25,10 +29,6 @@ import org.springframework.data.r2dbc.dialect.H2Dialect; import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories; import org.springframework.r2dbc.core.DatabaseClient; -import io.r2dbc.h2.H2ConnectionConfiguration; -import io.r2dbc.h2.H2ConnectionFactory; -import io.r2dbc.spi.ConnectionFactory; - /** * @author Rohan Mukesh * @author Artem Bilan diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/dsl/R2dbcDslTests.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/dsl/R2dbcDslTests.java index 4cddc94d2c..07118b0e11 100644 --- a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/dsl/R2dbcDslTests.java +++ b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/dsl/R2dbcDslTests.java @@ -16,14 +16,14 @@ package org.springframework.integration.r2dbc.dsl; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.Lifecycle; @@ -43,8 +43,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.awaitility.Awaitility.await; /** * @author Artem Bilan @@ -103,10 +102,10 @@ public class R2dbcDslTests { IntegrationFlow r2dbcDslFlow(R2dbcEntityTemplate r2dbcEntityTemplate) { return IntegrationFlow .from(R2dbc.inboundChannelAdapter(r2dbcEntityTemplate, - (selectCreator) -> - selectCreator.createSelect("person") - .withProjection("*") - .withCriteria(Criteria.where("id").is(1))) + (selectCreator) -> + selectCreator.createSelect("person") + .withProjection("*") + .withCriteria(Criteria.where("id").is(1))) .expectSingleResult(true) .payloadType(Person.class) .updateSql("UPDATE Person SET id='2' where id = :id") diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/entity/Person.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/entity/Person.java index 3a1dcaec7d..ed346975fc 100644 --- a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/entity/Person.java +++ b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/entity/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,7 +66,8 @@ public class Person { return this.age; } - @Override public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (this == o) { return true; } @@ -79,11 +80,13 @@ public class Person { Objects.equals(this.age, person.age); } - @Override public int hashCode() { + @Override + public int hashCode() { return Objects.hash(this.id, this.name, this.age); } - @Override public String toString() { + @Override + public String toString() { return "Person{" + "id=" + this.id + ", name='" + this.name + '\'' + diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSourceTests.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSourceTests.java index 9c7207a1d0..433e6919de 100644 --- a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSourceTests.java +++ b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/inbound/R2dbcMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,14 +17,15 @@ package org.springframework.integration.r2dbc.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -39,9 +40,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Rohan Mukesh @@ -92,7 +91,7 @@ public class R2dbcMessageSourceTests { @Test public void validateComponentType() { assertThat(this.defaultR2dbcMessageSource.getComponentType()) - .isEqualTo("r2dbc:inbound-channel-adapter"); + .isEqualTo("r2dbc:inbound-channel-adapter"); } @Test diff --git a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java index c8cf5417fc..304836c2f6 100644 --- a/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java +++ b/spring-integration-r2dbc/src/test/java/org/springframework/integration/r2dbc/outbound/R2dbcMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.r2dbc.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.Arrays; import java.util.HashMap; @@ -28,6 +26,8 @@ import java.util.Optional; import org.junit.Assert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -45,8 +45,7 @@ import org.springframework.r2dbc.core.DatabaseClient; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Rohan Mukesh diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java index 78d6204f31..3f31cbf8e9 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java @@ -211,7 +211,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel MessageListenerDelegate() { } - @SuppressWarnings({ "unused" }) + @SuppressWarnings({"unused"}) public void handleMessage(Object payload) { Message siMessage = SubscribableRedisChannel.this.messageConverter.toMessage(payload, null); try { diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisOutboundGatewayParser.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisOutboundGatewayParser.java index aa1b215d2f..370aa0f3f7 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisOutboundGatewayParser.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisOutboundGatewayParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,8 +73,8 @@ public class RedisOutboundGatewayParser extends AbstractConsumerEndpointParser { if (hasArgumentExpressions) { BeanDefinitionBuilder argumentsBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExpressionArgumentsStrategy.class) - .addConstructorArgValue(argumentExpressions) - .addConstructorArgValue(element.getAttribute("use-command-variable")); + .addConstructorArgValue(argumentExpressions) + .addConstructorArgValue(element.getAttribute("use-command-variable")); builder.addPropertyValue("argumentsStrategy", argumentsBuilder.getBeanDefinition()); } else if (StringUtils.hasLength(argumentsStrategy)) { diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java index 3d925a4ec0..5ad255781c 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import java.time.Duration; import java.util.function.Function; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.convert.ConversionFailedException; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; @@ -44,9 +46,6 @@ import org.springframework.messaging.converter.MessageConversionException; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * A {@link MessageProducerSupport} for reading messages from a Redis Stream and publishing them into the provided * output channel. diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandler.java index a424dc57ee..b0c4d11b5a 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package org.springframework.integration.redis.outbound; +import reactor.core.publisher.Mono; + import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; import org.springframework.data.redis.connection.stream.Record; import org.springframework.data.redis.connection.stream.StreamRecords; @@ -32,8 +34,6 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.Message; import org.springframework.util.Assert; -import reactor.core.publisher.Mono; - /** * Implementation of {@link org.springframework.messaging.ReactiveMessageHandler} which writes * Message payload or Message itself (see {@link #extractPayload}) into a Redis stream using Reactive Stream operations. @@ -124,7 +124,7 @@ public class ReactiveRedisStreamMessageHandler extends AbstractReactiveMessageHa this.hashMapper == null ? template.opsForStream() : template.opsForStream( - (HashMapper) this.hashMapper); + (HashMapper) this.hashMapper); } @Override diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java index 2cc37ee5f9..6adbd538a8 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,7 +152,7 @@ public class RedisOutboundGateway extends AbstractReplyProducingMessageHandler { return (Object[]) payload; } else { - return new Object[]{payload}; + return new Object[] {payload}; } } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java index d9c12cc9a6..11aa17e2af 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisChannelPriorityMessageStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -173,5 +173,4 @@ public class RedisChannelPriorityMessageStore extends RedisChannelMessageStore return count; } - } diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisContainerTest.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisContainerTest.java index 6c32685234..2db10a83af 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisContainerTest.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/RedisContainerTest.java @@ -16,10 +16,10 @@ package org.springframework.integration.redis; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; +import io.lettuce.core.ClientOptions; +import io.lettuce.core.SocketOptions; import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Testcontainers; @@ -38,8 +38,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; -import io.lettuce.core.ClientOptions; -import io.lettuce.core.SocketOptions; +import static org.assertj.core.api.Assertions.assertThat; /** * The base contract for all tests requiring a Redis connection. diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java index 08238c0558..d76619a79c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.redis.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.lang.reflect.InvocationTargetException; import java.util.Map; import java.util.Set; @@ -39,6 +35,10 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java index e84c8cbb42..c12ea4e8d3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,6 +37,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java index 07feba9839..e9451c1620 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.Executor; import org.junit.jupiter.api.Test; @@ -38,6 +36,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java index e46d518d6a..2b77bc6407 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests.java index 01d37284ab..63c34ba197 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueGatewayIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -39,6 +37,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Liu * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests.java index fa40ab02b0..0a16dd620e 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +32,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParserTests.java index a9d21d968b..ac6e65adc6 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Liu diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests.java index f33e60ec87..720aa3cb2b 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; @@ -34,6 +32,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundGatewayParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundGatewayParserTests.java index 018de47a74..6b27b488f7 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundGatewayParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisQueueOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -32,6 +30,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Liu * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreInboundChannelAdapterParserTests.java index 04511771f1..026f9f806f 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreInboundChannelAdapterParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +30,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreOutboundChannelAdapterParserTests.java index 0e6f3c8d66..c6d6acb9f7 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisStoreOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2021 the original author or authors. + * Copyright 2007-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.redis.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.aop.framework.Advised; @@ -36,6 +34,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Oleg Zhurakousky diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java index 245db8e287..8e320632a9 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Date; import java.util.concurrent.atomic.AtomicReference; @@ -27,6 +24,9 @@ import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -56,9 +56,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; /** * @author Attoumane Ahamadi diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java index affe89d0c8..7510703e5a 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -33,6 +30,9 @@ import org.springframework.integration.redis.support.RedisHeaders; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java index a4cdfe3e18..a2acd3723a 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpointTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.redis.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -66,6 +61,11 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ClassUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.verify; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java index f9423fc065..c85d788c1c 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -34,6 +32,8 @@ import org.springframework.integration.redis.RedisContainerTest; import org.springframework.messaging.Message; import org.springframework.messaging.SubscribableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/leader/RedisLockRegistryLeaderInitiatorTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/leader/RedisLockRegistryLeaderInitiatorTests.java index ba2ae4f0b1..cfd4175e88 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/leader/RedisLockRegistryLeaderInitiatorTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/leader/RedisLockRegistryLeaderInitiatorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.leader; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -37,6 +35,8 @@ import org.springframework.integration.support.leader.LockRegistryLeaderInitiato import org.springframework.integration.test.condition.LogLevels; import org.springframework.scheduling.concurrent.CustomizableThreadFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/metadata/RedisMetadataStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/metadata/RedisMetadataStoreTests.java index 878562cd2c..abe7e6e0a3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/metadata/RedisMetadataStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/metadata/RedisMetadataStoreTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.metadata; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -29,6 +26,9 @@ import org.springframework.data.redis.core.BoundHashOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.integration.redis.RedisContainerTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java index 3b7f5a136b..c9d6bf8162 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/ReactiveRedisStreamMessageHandlerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.List; @@ -44,6 +42,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Attoumane Ahamadi * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java index 89ae2dad9f..19c7d7ce22 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisOutboundGatewayTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Arrays; import java.util.List; @@ -38,6 +35,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java index b8e152e7fd..64b92f4e1b 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandlerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -35,6 +33,8 @@ import org.springframework.expression.common.LiteralExpression; import org.springframework.integration.redis.RedisContainerTest; import org.springframework.integration.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java index e3a59189bc..8a5587e0b5 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisQueueOutboundChannelAdapterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Date; import java.util.concurrent.TimeUnit; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java index a30ed4024b..d806f2a4f2 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -59,6 +56,9 @@ import org.springframework.messaging.MessageHandlingException; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java index 60f8959280..9a21aa4ee9 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.redis.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -50,6 +45,11 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java index 5a03fbab6b..56ebb6ce75 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -38,6 +35,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests.java index b3cada21dc..597a686bc0 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisChannelMessageStoreTests.java @@ -16,12 +16,11 @@ package org.springframework.integration.redis.store; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,7 +41,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java index cec5cb15ac..e70bf2c741 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -30,6 +27,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import com.fasterxml.jackson.databind.ObjectMapper; +import junit.framework.AssertionFailedError; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -56,8 +55,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ErrorMessage; import org.springframework.messaging.support.GenericMessage; -import com.fasterxml.jackson.databind.ObjectMapper; -import junit.framework.AssertionFailedError; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * @author Oleg Zhurakousky diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java index be30faa312..c4e12277c4 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.store; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -42,6 +39,9 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests.java index cca642af0a..b49922895d 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.redis.util; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -45,6 +43,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java index 92f2cea976..d40d25e9d9 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/CustomJsonSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,9 @@ package org.springframework.integration.redis.util; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; import org.springframework.integration.mapping.InboundMessageMapper; @@ -23,13 +26,10 @@ import org.springframework.integration.support.json.Jackson2JsonMessageParser; import org.springframework.integration.support.json.JsonInboundMessageMapper; import org.springframework.messaging.Message; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - /** -* @author Artem Bilan -* @since 3.0 -*/ + * @author Artem Bilan + * @since 3.0 + */ public class CustomJsonSerializer implements RedisSerializer> { private final ObjectMapper objectMapper = new ObjectMapper(); diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/RedisLockRegistryTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/RedisLockRegistryTests.java index 17c5ad55d3..85e72e799a 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/RedisLockRegistryTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/util/RedisLockRegistryTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.redis.util; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.util.List; import java.util.Map; import java.util.Queue; @@ -52,6 +49,9 @@ import org.springframework.integration.redis.RedisContainerTest; import org.springframework.integration.redis.util.RedisLockRegistry.RedisLockType; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + /** * @author Gary Russell * @author Konstantin Yakimov diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java index f3ef40b5f3..5399ae91c7 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ClientRSocketConnector.java @@ -21,15 +21,15 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; +import io.rsocket.transport.ClientTransport; +import io.rsocket.transport.netty.client.TcpClientTransport; +import io.rsocket.transport.netty.client.WebsocketClientTransport; + import org.springframework.messaging.rsocket.RSocketConnectorConfigurer; import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.util.Assert; import org.springframework.util.MimeType; -import io.rsocket.transport.ClientTransport; -import io.rsocket.transport.netty.client.TcpClientTransport; -import io.rsocket.transport.netty.client.WebsocketClientTransport; - /** * A client {@link AbstractRSocketConnector} extension to the RSocket connection. * @@ -46,7 +46,8 @@ public class ClientRSocketConnector extends AbstractRSocketConnector { private final Map setupMetadata = new LinkedHashMap<>(4); - private RSocketConnectorConfigurer connectorConfigurer = (connector) -> { }; + private RSocketConnectorConfigurer connectorConfigurer = (connector) -> { + }; private Object setupData; diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java index f120e8427b..0be43c31b4 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/IntegrationRSocketMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,11 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import io.rsocket.Payload; +import io.rsocket.frame.FrameType; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + import org.springframework.context.ApplicationContext; import org.springframework.core.MethodParameter; import org.springframework.core.ReactiveAdapterRegistry; @@ -42,11 +47,6 @@ import org.springframework.messaging.rsocket.annotation.support.RSocketPayloadRe import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; -import io.rsocket.Payload; -import io.rsocket.frame.FrameType; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * The {@link RSocketMessageHandler} extension for Spring Integration needs. *

@@ -159,7 +159,8 @@ class IntegrationRSocketMessageHandler extends RSocketMessageHandler { super(encoders, registry); } - @Override public Mono handleReturnValue(@Nullable Object returnValue, MethodParameter returnType, + @Override + public Mono handleReturnValue(@Nullable Object returnValue, MethodParameter returnType, Message message) { AtomicReference> responseReference = getResponseReference(message); diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java index 443851b51d..a61b434ae8 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketConnector.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,15 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.function.Consumer; +import io.rsocket.core.RSocketServer; +import io.rsocket.transport.ServerTransport; +import io.rsocket.transport.netty.server.CloseableChannel; +import io.rsocket.transport.netty.server.TcpServerTransport; +import io.rsocket.transport.netty.server.WebsocketServerTransport; +import reactor.core.Disposable; +import reactor.core.publisher.Mono; +import reactor.netty.http.server.HttpServer; + import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEventPublisher; @@ -31,15 +40,6 @@ import org.springframework.messaging.rsocket.RSocketStrategies; import org.springframework.util.Assert; import org.springframework.util.MimeType; -import io.rsocket.core.RSocketServer; -import io.rsocket.transport.ServerTransport; -import io.rsocket.transport.netty.server.CloseableChannel; -import io.rsocket.transport.netty.server.TcpServerTransport; -import io.rsocket.transport.netty.server.WebsocketServerTransport; -import reactor.core.Disposable; -import reactor.core.publisher.Mono; -import reactor.netty.http.server.HttpServer; - /** * A server {@link AbstractRSocketConnector} extension to accept and manage client RSocket connections. * diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketMessageHandler.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketMessageHandler.java index 35e7a40635..8106b442bd 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketMessageHandler.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/ServerRSocketMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +134,7 @@ public class ServerRSocketMessageHandler extends IntegrationRSocketMessageHandle registerHandlerMethod(this, HANDLE_CONNECTION_SETUP_METHOD, new CompositeMessageCondition( RSocketFrameTypeMessageCondition.CONNECT_CONDITION, - new DestinationPatternsMessageCondition(new String[] { "*" }, obtainRouteMatcher()))); + new DestinationPatternsMessageCondition(new String[] {"*"}, obtainRouteMatcher()))); } @SuppressWarnings("unused") diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java index cd807c4119..6d2acbb52f 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/inbound/RSocketInboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.concurrent.atomic.AtomicReference; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.ReactiveAdapter; import org.springframework.core.ResolvableType; @@ -43,9 +45,6 @@ import org.springframework.messaging.rsocket.annotation.support.RSocketPayloadRe import org.springframework.util.Assert; import org.springframework.util.MimeType; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * The {@link MessagingGatewaySupport} implementation for the {@link IntegrationRSocketEndpoint}. * Represents an inbound endpoint for RSocket requests. diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java index 4fb1ba4b4d..90b07f270b 100644 --- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java +++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,8 @@ import java.util.Arrays; import java.util.Map; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ResolvableType; @@ -39,9 +41,6 @@ import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; import org.springframework.util.MimeType; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * An Outbound Messaging Gateway for RSocket requests. * The request logic is fully based on the {@link RSocketRequester}, which can be obtained from the diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests.java index 64d6452e1d..ac35e11092 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests.java +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.rsocket.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +26,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests.java index c4c5c0fe66..d31b7b20a0 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests.java +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/config/RSocketOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.rsocket.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import org.junit.jupiter.api.Test; @@ -31,6 +29,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.MimeType; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/dsl/RSocketDslTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/dsl/RSocketDslTests.java index 55dac63639..1f726a2d95 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/dsl/RSocketDslTests.java +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/dsl/RSocketDslTests.java @@ -16,12 +16,12 @@ package org.springframework.integration.rsocket.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; import java.util.function.Function; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -38,8 +38,7 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/inbound/RSocketInboundGatewayIntegrationTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/inbound/RSocketInboundGatewayIntegrationTests.java index 0d771dbb1a..ed2ce8efeb 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/inbound/RSocketInboundGatewayIntegrationTests.java +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/inbound/RSocketInboundGatewayIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,21 @@ package org.springframework.integration.rsocket.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; +import io.rsocket.core.RSocketServer; +import io.rsocket.frame.decoder.PayloadDecoder; +import io.rsocket.transport.netty.server.CloseableChannel; +import io.rsocket.transport.netty.server.TcpServerTransport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -44,14 +50,7 @@ import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import io.rsocket.core.RSocketServer; -import io.rsocket.frame.decoder.PayloadDecoder; -import io.rsocket.transport.netty.server.CloseableChannel; -import io.rsocket.transport.netty.server.TcpServerTransport; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan diff --git a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java index 843d0a0f10..3c28a531a4 100644 --- a/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java +++ b/spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java @@ -16,15 +16,23 @@ package org.springframework.integration.rsocket.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.Duration; +import io.rsocket.RSocket; +import io.rsocket.core.RSocketServer; +import io.rsocket.frame.decoder.PayloadDecoder; +import io.rsocket.transport.netty.server.CloseableChannel; +import io.rsocket.transport.netty.server.TcpServerTransport; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInfo; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Sinks; +import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -57,16 +65,7 @@ import org.springframework.stereotype.Controller; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import io.rsocket.RSocket; -import io.rsocket.core.RSocketServer; -import io.rsocket.frame.decoder.PayloadDecoder; -import io.rsocket.transport.netty.server.CloseableChannel; -import io.rsocket.transport.netty.server.TcpServerTransport; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.publisher.Sinks; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Artem Bilan @@ -183,9 +182,9 @@ public class RSocketOutboundGatewayIntegrationTests { StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .map(Message::getPayload) - .cast(String.class)) + Flux.from(resultChannel) + .map(Message::getPayload) + .cast(String.class)) .expectNext("Hello") .thenCancel() .verifyLater(); @@ -215,9 +214,9 @@ public class RSocketOutboundGatewayIntegrationTests { StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .map(Message::getPayload) - .cast(String.class)) + Flux.from(resultChannel) + .map(Message::getPayload) + .cast(String.class)) .expectNext("Hello async") .thenCancel() .verifyLater(); @@ -248,10 +247,10 @@ public class RSocketOutboundGatewayIntegrationTests { @SuppressWarnings("unchecked") StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .next() - .map(Message::getPayload) - .flatMapMany((payload) -> (Flux) payload)) + Flux.from(resultChannel) + .next() + .map(Message::getPayload) + .flatMapMany((payload) -> (Flux) payload)) .expectNext("Hello 0").expectNextCount(6).expectNext("Hello 7") .thenCancel() .verifyLater(); @@ -282,10 +281,10 @@ public class RSocketOutboundGatewayIntegrationTests { @SuppressWarnings("unchecked") StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .next() - .map(Message::getPayload) - .flatMapMany((payload) -> (Flux) payload)) + Flux.from(resultChannel) + .next() + .map(Message::getPayload) + .flatMapMany((payload) -> (Flux) payload)) .expectNext("Hello 1 async").expectNextCount(8).expectNext("Hello 10 async") .thenCancel() .verifyLater(); @@ -376,9 +375,9 @@ public class RSocketOutboundGatewayIntegrationTests { StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .map(Message::getPayload) - .cast(String.class)) + Flux.from(resultChannel) + .map(Message::getPayload) + .cast(String.class)) .expectNext("Invalid input error handled") .thenCancel() .verifyLater(); @@ -408,9 +407,9 @@ public class RSocketOutboundGatewayIntegrationTests { StepVerifier verifier = StepVerifier.create( - Flux.from(resultChannel) - .map(Message::getPayload) - .cast(String.class)) + Flux.from(resultChannel) + .map(Message::getPayload) + .cast(String.class)) .expectNext("Invalid input error handled") .thenCancel() .verifyLater(); diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutorFactory.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutorFactory.java index 273bac0dcc..e9a9fb3a57 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutorFactory.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutorFactory.java @@ -37,7 +37,7 @@ public final class ScriptExecutorFactory { if (language.equalsIgnoreCase("python") || language.equalsIgnoreCase("jython")) { return new PythonScriptExecutor(); } - else if (language.equalsIgnoreCase("ruby") || language.equalsIgnoreCase("jruby")) { + else if (language.equalsIgnoreCase("ruby") || language.equalsIgnoreCase("jruby")) { return new RubyScriptExecutor(); } else if (language.equalsIgnoreCase("kotlin")) { diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests.java index 17067c05fb..20d5347b34 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Int3164Jsr223RefreshTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @since 3.0 diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java index 65935d7485..dfb56b03e7 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author David Turanski diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java index 39161bc3e4..79f99eef19 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @@ -27,6 +25,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author David Turanski diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java index 161b2802cb..e286d53938 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Date; import org.junit.jupiter.api.Test; @@ -30,6 +28,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java index b976a6b31f..d2497a0df9 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.beans.PropertyEditorSupport; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -34,6 +32,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author David Turanski @@ -67,6 +67,7 @@ public class Jsr223RefreshTests { private static class CycleResource extends AbstractResource { private int count = -1; + private final String[] scripts = {"\"ruby-#{payload}-0\"", "\"ruby-#{payload}-1\""}; CycleResource() { diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java index b88d715d85..ca978e5eb3 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -29,6 +27,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author David Turanski diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java index 24f64aad22..bab6386472 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -35,6 +32,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java index 9dd7d2ca82..0cb71cd959 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -29,6 +27,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @since 2.0 diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java index 62792f9a1b..a95a1e0aaf 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.config.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashSet; import java.util.Set; @@ -33,6 +31,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/dsl/ScriptsTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/dsl/ScriptsTests.java index ef137ec22a..ad2bac6de2 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/dsl/ScriptsTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/dsl/ScriptsTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.IOException; import java.util.Date; @@ -47,6 +45,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -270,7 +270,6 @@ public class ScriptsTests { .channel(results()); } - } } diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/DeriveLanguageFromExtensionTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/DeriveLanguageFromExtensionTests.java index eb15ebfc3e..fadb45506a 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/DeriveLanguageFromExtensionTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/DeriveLanguageFromExtensionTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.scripting.jsr223; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -30,6 +27,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author David Turanski * @author Artem Bilan @@ -43,7 +43,7 @@ public class DeriveLanguageFromExtensionTests { @Test public void testParseLanguage() { - String[] langs = { "ruby", "Groovy", "python", "kotlin" }; + String[] langs = {"ruby", "Groovy", "python", "kotlin"}; Class[] executors = { RubyScriptExecutor.class, DefaultScriptExecutor.class, diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java index 3a0dd9f9eb..70eccb6fc5 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -33,6 +31,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.scripting.ScriptSource; import org.springframework.scripting.support.ResourceScriptSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutorTests.java index f300235fbd..04f8c2108a 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.scripting.jsr223; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; - import java.util.HashMap; import java.util.Map; @@ -30,6 +27,9 @@ import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.scripting.support.StaticScriptSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + /** * @author David Turanski * @author Artem Bilan diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutorTests.java index 8494e246ec..1e5c58a656 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonScriptExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -31,6 +29,8 @@ import org.springframework.scripting.ScriptSource; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.scripting.support.StaticScriptSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * @author Gary Russell diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonVariableParserTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonVariableParserTests.java index 44d8d87c73..b4170172f5 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonVariableParserTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/PythonVariableParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.scripting.jsr223; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import org.junit.Test; @@ -26,6 +24,8 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.scripting.ScriptSource; import org.springframework.scripting.support.ResourceScriptSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author David Turanski * diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java index 83c143c2f0..040d3d32d1 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.security.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -38,6 +35,9 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java index 173cd3eb46..98fb95ee40 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.security.channel; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -33,6 +31,8 @@ import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.messaging.access.intercept.AuthorizationChannelInterceptor; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/config/ChannelSecurityAnnotationTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/config/ChannelSecurityAnnotationTests.java index a30114e014..034ac4f7fa 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/config/ChannelSecurityAnnotationTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/config/ChannelSecurityAnnotationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.security.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -74,6 +71,9 @@ import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecu import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @@ -335,7 +335,7 @@ public class ChannelSecurityAnnotationTests { @GlobalChannelInterceptor(patterns = { "#{'queueChannel'}", "${security.channel:executorChannel}", - "publishSubscribeChannel" }) + "publishSubscribeChannel"}) public ChannelInterceptor securityContextPropagationInterceptor() { return new SecurityContextPropagationChannelInterceptor(); } diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java index f131a76b20..58f2d3a67f 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/DefaultSftpSessionFactory.java @@ -308,7 +308,7 @@ public class DefaultSftpSessionFactory implements SessionFactory { } } - } diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java index 246465eb96..2b6b9601b9 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +25,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java index 785e1613ac..623d2b4f0c 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.File; import java.util.Collection; import java.util.Comparator; @@ -42,6 +39,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserCachingTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserCachingTests.java index cd49789e06..df666eed3b 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserCachingTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserCachingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +25,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java index 7a14dee03b..f548c8bd74 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.nio.charset.StandardCharsets; import java.util.Iterator; import java.util.Set; @@ -46,6 +43,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java index bf6011053c..920924df82 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; @@ -42,6 +40,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Gunnar Hillert diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests.java index 8e776dc44e..aa80b8028b 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpStreamingInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2020 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.sftp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Iterator; import java.util.Set; @@ -42,6 +38,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java index 9947289e0c..9828fe7ad4 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.InputStream; import java.nio.file.attribute.PosixFilePermission; @@ -54,6 +52,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpFileListFilterTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpFileListFilterTests.java index cb4fff802b..466f26468c 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpFileListFilterTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpFileListFilterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.List; @@ -33,6 +31,8 @@ import org.springframework.integration.sftp.session.SftpRemoteFileTemplate; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java index d669ea3d2a..ba8a74dc7d 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.filters; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.file.attribute.FileTime; import java.time.Instant; import java.util.Arrays; @@ -28,6 +26,8 @@ import org.junit.jupiter.api.Test; import org.springframework.integration.metadata.SimpleMetadataStore; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author David Liu @@ -47,7 +47,7 @@ public class SftpPersistentAcceptOnceFileListFilterTests { SftpClient.DirEntry sftpFile1 = new SftpClient.DirEntry("foo", "foo", attrs); SftpClient.DirEntry sftpFile2 = new SftpClient.DirEntry("bar", "bar", attrs); SftpClient.DirEntry sftpFile3 = new SftpClient.DirEntry("baz", "baz", attrs); - SftpClient.DirEntry[] files = new SftpClient.DirEntry[]{ sftpFile1, sftpFile2, sftpFile3 }; + SftpClient.DirEntry[] files = new SftpClient.DirEntry[] {sftpFile1, sftpFile2, sftpFile3}; List passed = filter.filterFiles(files); assertThat(Arrays.equals(files, passed.toArray())).isTrue(); List now = filter.filterFiles(files); @@ -70,7 +70,7 @@ public class SftpPersistentAcceptOnceFileListFilterTests { attrs.setModifyTime(FileTime.from(Instant.now())); SftpClient.DirEntry sftpFile1 = new SftpClient.DirEntry("foo", "same", attrs); SftpClient.DirEntry sftpFile2 = new SftpClient.DirEntry("bar", "same", attrs); - SftpClient.DirEntry[] files = new SftpClient.DirEntry[]{ sftpFile1, sftpFile2 }; + SftpClient.DirEntry[] files = new SftpClient.DirEntry[] {sftpFile1, sftpFile2}; List now = filter.filterFiles(files); assertThat(now.size()).isEqualTo(2); assertThat(now.get(0).getFilename()).isEqualTo("foo"); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/RollbackLocalFilterTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/RollbackLocalFilterTests.java index 936d63a09e..e8451314f2 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/RollbackLocalFilterTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/RollbackLocalFilterTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -35,6 +33,8 @@ import org.springframework.integration.sftp.SftpTestSupport; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java index 45eb154a1d..1c99b85f2a 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java @@ -16,14 +16,6 @@ package org.springframework.integration.sftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.given; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.FileInputStream; import java.net.URI; @@ -55,6 +47,14 @@ import org.springframework.integration.sftp.session.SftpTestSessionFactory; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpMessageSourceTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpMessageSourceTests.java index 3aa0c1eab4..16ed45ee7e 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpMessageSourceTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +27,8 @@ import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSourceTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSourceTests.java index e126e35376..6f026a0171 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSourceTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpStreamingMessageSourceTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.InputStream; import java.time.Duration; import java.util.Arrays; @@ -54,6 +52,8 @@ import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/BigMGetTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/BigMGetTests.java index 6b040d9493..8ecc29cdc5 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/BigMGetTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/BigMGetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.sftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.2 diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java index ef314b443d..3aeef4d07e 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java @@ -16,18 +16,6 @@ package org.springframework.integration.sftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.AdditionalMatchers.and; -import static org.mockito.AdditionalMatchers.not; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -71,6 +59,18 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.AdditionalMatchers.and; +import static org.mockito.AdditionalMatchers.not; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Oleg Zhurakousky * @author Gary Russell @@ -224,7 +224,7 @@ public class SftpOutboundTests { } @ParameterizedTest - @ValueSource(booleans = { true, false }) + @ValueSource(booleans = {true, false}) public void testSharedSession(boolean sharedSession) throws IOException { try (SshServer server = SshServer.setUpDefaultServer()) { server.setPasswordAuthenticator((arg0, arg1, arg2) -> true); diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java index 169b7e07e4..2af7fbb44e 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpServerOutboundTests.java @@ -16,16 +16,6 @@ package org.springframework.integration.sftp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -83,6 +73,16 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java index c3b3f25a10..1f1e167c1a 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/ResourceKnownHostsServerKeyVerifierTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.session; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.nio.file.Path; import java.security.GeneralSecurityException; @@ -44,6 +42,8 @@ import org.mockito.Mockito; import org.springframework.core.io.FileSystemResource; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Artem Bilan @@ -70,7 +70,7 @@ public class ResourceKnownHostsServerKeyVerifierTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) void testServerKeys() { ResourceKnownHostsServerKeyVerifier verifier = new ResourceKnownHostsServerKeyVerifier( diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java index fee997e7f4..2770e22182 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.sftp.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -45,6 +41,10 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java index 98a7d54c78..1d03c556b3 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.sftp.session; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -45,6 +43,8 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.util.Base64Utils; import org.springframework.util.FileCopyUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * * * @author Gary Russell diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java index a048af3bec..006a8dad78 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.sftp.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.File; import java.net.ConnectException; @@ -27,6 +24,9 @@ import org.apache.sshd.server.SshServer; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java index 7eb66d7dd7..4a5de2eb12 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpTestSessionFactory.java @@ -17,11 +17,11 @@ package org.springframework.integration.sftp.session; +import org.apache.sshd.sftp.client.SftpClient; + import static org.mockito.BDDMockito.willReturn; import static org.mockito.Mockito.spy; -import org.apache.sshd.sftp.client.SftpClient; - /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/Smb.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/Smb.java index e9079757b5..386978535d 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/Smb.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/Smb.java @@ -19,6 +19,8 @@ package org.springframework.integration.smb.dsl; import java.io.File; import java.util.Comparator; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.remote.MessageSessionCallback; import org.springframework.integration.file.remote.RemoteFileTemplate; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway; @@ -27,8 +29,6 @@ import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.smb.outbound.SmbOutboundGateway; import org.springframework.integration.smb.session.SmbRemoteFileTemplate; -import jcifs.smb.SmbFile; - /** * The factory for SMB components. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbInboundChannelAdapterSpec.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbInboundChannelAdapterSpec.java index ea47a68b03..c7990d97ec 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbInboundChannelAdapterSpec.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbInboundChannelAdapterSpec.java @@ -19,6 +19,8 @@ package org.springframework.integration.smb.dsl; import java.io.File; import java.util.Comparator; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.dsl.RemoteFileInboundChannelAdapterSpec; import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.integration.file.filters.FileListFilter; @@ -30,8 +32,6 @@ import org.springframework.integration.smb.filters.SmbSimplePatternFileListFilte import org.springframework.integration.smb.inbound.SmbInboundFileSynchronizer; import org.springframework.integration.smb.inbound.SmbInboundFileSynchronizingMessageSource; -import jcifs.smb.SmbFile; - /** * A {@link RemoteFileInboundChannelAdapterSpec} for an {@link SmbInboundFileSynchronizingMessageSource}. * @@ -41,7 +41,7 @@ import jcifs.smb.SmbFile; */ public class SmbInboundChannelAdapterSpec extends RemoteFileInboundChannelAdapterSpec { + SmbInboundFileSynchronizingMessageSource> { protected SmbInboundChannelAdapterSpec(SessionFactory sessionFactory, Comparator comparator) { super(new SmbInboundFileSynchronizer(sessionFactory)); diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbMessageHandlerSpec.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbMessageHandlerSpec.java index fe91985a1a..a3f1ef9620 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbMessageHandlerSpec.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbMessageHandlerSpec.java @@ -16,14 +16,14 @@ package org.springframework.integration.smb.dsl; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.dsl.FileTransferringMessageHandlerSpec; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.smb.outbound.SmbMessageHandler; import org.springframework.integration.smb.session.SmbRemoteFileTemplate; -import jcifs.smb.SmbFile; - /** * A {@link FileTransferringMessageHandlerSpec} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbOutboundGatewaySpec.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbOutboundGatewaySpec.java index 97a96ac8a9..bf57e9402f 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbOutboundGatewaySpec.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbOutboundGatewaySpec.java @@ -16,13 +16,13 @@ package org.springframework.integration.smb.dsl; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.dsl.RemoteFileOutboundGatewaySpec; import org.springframework.integration.smb.filters.SmbRegexPatternFileListFilter; import org.springframework.integration.smb.filters.SmbSimplePatternFileListFilter; import org.springframework.integration.smb.outbound.SmbOutboundGateway; -import jcifs.smb.SmbFile; - /** * A {@link RemoteFileOutboundGatewaySpec} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbStreamingInboundChannelAdapterSpec.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbStreamingInboundChannelAdapterSpec.java index 07619a8c58..4768f2bd76 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbStreamingInboundChannelAdapterSpec.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/dsl/SmbStreamingInboundChannelAdapterSpec.java @@ -18,6 +18,8 @@ package org.springframework.integration.smb.dsl; import java.util.Comparator; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.dsl.RemoteFileStreamingInboundChannelAdapterSpec; import org.springframework.integration.file.filters.CompositeFileListFilter; import org.springframework.integration.file.filters.FileListFilter; @@ -28,8 +30,6 @@ import org.springframework.integration.smb.filters.SmbRegexPatternFileListFilter import org.springframework.integration.smb.filters.SmbSimplePatternFileListFilter; import org.springframework.integration.smb.inbound.SmbStreamingMessageSource; -import jcifs.smb.SmbFile; - /** * A {@link RemoteFileStreamingInboundChannelAdapterSpec} for a {@link SmbStreamingMessageSource}. * @@ -39,7 +39,7 @@ import jcifs.smb.SmbFile; */ public class SmbStreamingInboundChannelAdapterSpec extends RemoteFileStreamingInboundChannelAdapterSpec { + SmbStreamingMessageSource> { protected SmbStreamingInboundChannelAdapterSpec(RemoteFileTemplate remoteFileTemplate, Comparator comparator) { diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java index d62727e239..c9dce57b72 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbPersistentAcceptOnceFileListFilter.java @@ -16,11 +16,11 @@ package org.springframework.integration.smb.filters; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.filters.AbstractPersistentAcceptOnceFileListFilter; import org.springframework.integration.metadata.ConcurrentMetadataStore; -import jcifs.smb.SmbFile; - /** * Implementation of {@link AbstractPersistentAcceptOnceFileListFilter} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java index 75bd14a693..e200e4b181 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java @@ -19,11 +19,11 @@ package org.springframework.integration.smb.filters; import java.io.UncheckedIOException; import java.util.regex.Pattern; -import org.springframework.integration.file.filters.AbstractRegexPatternFileListFilter; - import jcifs.smb.SmbException; import jcifs.smb.SmbFile; +import org.springframework.integration.file.filters.AbstractRegexPatternFileListFilter; + /** * Implementation of {@link AbstractRegexPatternFileListFilter} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java index 2867888995..bb81a06593 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java @@ -18,11 +18,11 @@ package org.springframework.integration.smb.filters; import java.io.UncheckedIOException; -import org.springframework.integration.file.filters.AbstractSimplePatternFileListFilter; - import jcifs.smb.SmbException; import jcifs.smb.SmbFile; +import org.springframework.integration.file.filters.AbstractSimplePatternFileListFilter; + /** * Implementation of {@link AbstractSimplePatternFileListFilter} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java index fb8400c42d..97b6703da1 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSystemMarkerFilePresentFileListFilter.java @@ -19,11 +19,11 @@ package org.springframework.integration.smb.filters; import java.util.Map; import java.util.function.Function; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.filters.AbstractMarkerFilePresentFileListFilter; import org.springframework.integration.file.filters.FileListFilter; -import jcifs.smb.SmbFile; - /** * Implementation of {@link AbstractMarkerFilePresentFileListFilter} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java index bdd237427b..acbb612c19 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java @@ -16,11 +16,11 @@ package org.springframework.integration.smb.inbound; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer; -import jcifs.smb.SmbFile; - /** * An implementation of {@link AbstractInboundFileSynchronizer} for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java index 7dd5740d73..ee8bd84439 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java @@ -19,11 +19,11 @@ package org.springframework.integration.smb.inbound; import java.io.File; import java.util.Comparator; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizer; import org.springframework.integration.file.remote.synchronizer.AbstractInboundFileSynchronizingMessageSource; -import jcifs.smb.SmbFile; - /** * A {@link org.springframework.integration.core.MessageSource} implementation for SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java index 54e0f808df..68c89a0569 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbStreamingMessageSource.java @@ -21,6 +21,8 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; +import jcifs.smb.SmbException; +import jcifs.smb.SmbFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -31,9 +33,6 @@ import org.springframework.integration.metadata.SimpleMetadataStore; import org.springframework.integration.smb.filters.SmbPersistentAcceptOnceFileListFilter; import org.springframework.integration.smb.session.SmbFileInfo; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; - /** * Message source for streaming SMB remote file contents. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbMessageHandler.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbMessageHandler.java index e104bc3f98..e8da5b1058 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbMessageHandler.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbMessageHandler.java @@ -16,13 +16,13 @@ package org.springframework.integration.smb.outbound; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.smb.session.SmbRemoteFileTemplate; -import jcifs.smb.SmbFile; - /** * The SMB specific {@link FileTransferringMessageHandler} extension. Based on the * {@link SmbRemoteFileTemplate}. diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java index a400721718..f8daf2eff8 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/outbound/SmbOutboundGateway.java @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import jcifs.smb.SmbException; +import jcifs.smb.SmbFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -33,9 +35,6 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.smb.session.SmbFileInfo; import org.springframework.integration.smb.session.SmbRemoteFileTemplate; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; - /** * Outbound Gateway for performing remote file operations via SMB. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java index 91d1b8b34d..27de4cef6c 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java @@ -19,11 +19,11 @@ package org.springframework.integration.smb.session; import java.net.URI; import java.net.URISyntaxException; +import jcifs.DialectVersion; + import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import jcifs.DialectVersion; - /** * Data holder class for a SMB share configuration. *

diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbFileInfo.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbFileInfo.java index aad1d3f178..405faa06cb 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbFileInfo.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbFileInfo.java @@ -18,16 +18,15 @@ package org.springframework.integration.smb.session; import java.io.IOException; +import jcifs.internal.dtyp.ACE; +import jcifs.smb.SmbException; +import jcifs.smb.SmbFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.file.remote.AbstractFileInfo; import org.springframework.util.Assert; -import jcifs.internal.dtyp.ACE; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; - /** * A {@link org.springframework.integration.file.remote.FileInfo} implementation for * SMB. diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbRemoteFileTemplate.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbRemoteFileTemplate.java index e35de352fd..21de176787 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbRemoteFileTemplate.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbRemoteFileTemplate.java @@ -16,11 +16,11 @@ package org.springframework.integration.smb.session; +import jcifs.smb.SmbFile; + import org.springframework.integration.file.remote.RemoteFileTemplate; import org.springframework.integration.file.remote.session.SessionFactory; -import jcifs.smb.SmbFile; - /** * The SMB-specific {@link RemoteFileTemplate} implementation. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java index 9df60ee219..c60a9322e0 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java @@ -25,16 +25,16 @@ import java.io.OutputStream; import java.net.URL; import java.util.Arrays; +import jcifs.smb.SmbException; +import jcifs.smb.SmbFile; +import jcifs.smb.SmbFileOutputStream; + import org.springframework.core.log.LogAccessor; import org.springframework.integration.file.remote.session.Session; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; -import jcifs.smb.SmbFileOutputStream; - /** * Implementation of the {@link Session} interface for Server Message Block (SMB) * also known as Common Internet File System (CIFS). The Samba project set out to diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java index 1aaa863fa5..007cc2c3f2 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java @@ -19,15 +19,14 @@ package org.springframework.integration.smb.session; import java.io.IOException; import java.util.Properties; +import jcifs.CIFSContext; +import jcifs.smb.SmbFile; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.util.Assert; -import jcifs.CIFSContext; -import jcifs.smb.SmbFile; - /** * The SMB session factory. * diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java index f543589359..3878f0223e 100644 --- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java +++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java @@ -20,12 +20,6 @@ import java.io.IOException; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.util.Assert; -import org.springframework.util.StringUtils; - import jcifs.CIFSContext; import jcifs.CIFSException; import jcifs.config.PropertyConfiguration; @@ -34,6 +28,11 @@ import jcifs.context.SingletonContext; import jcifs.smb.NtlmPasswordAuthenticator; import jcifs.smb.SmbException; import jcifs.smb.SmbFile; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; /** * The {@link SmbFile} extension to represent an SMB share directory. diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java index 6711e39976..fd3624b1e9 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -36,6 +34,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * Assorted test utils for the library. * diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java index 4367e00d20..05ef5a8710 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.URI; import java.net.URISyntaxException; @@ -27,6 +25,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.smb.session.SmbSessionFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Markus Spann * @author Prafull Kumar Soni diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbTestSupport.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbTestSupport.java index 9151e7beaa..da823f0a03 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbTestSupport.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbTestSupport.java @@ -21,6 +21,8 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Map; +import jcifs.DialectVersion; +import jcifs.smb.SmbFile; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeAll; import org.testcontainers.containers.GenericContainer; @@ -33,9 +35,6 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.smb.session.SmbSessionFactory; import org.springframework.integration.test.util.TestUtils; -import jcifs.DialectVersion; -import jcifs.smb.SmbFile; - /** * Provides a connection to a Testcontainers-driven SMB Server for test cases. * diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java index be674c69e7..122b70d894 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.smb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Collection; import java.util.Iterator; import java.util.Map; @@ -45,6 +41,10 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Markus Spann * @author Gunnar Hillert diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java index 2a47951734..bf86f8c2d7 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import org.junit.Ignore; @@ -36,6 +34,8 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * System tests that perform SMB access without any mocking. * These tests are annotated with '@Ignore', as they requires real SMB share configured @@ -49,7 +49,8 @@ import org.springframework.messaging.support.GenericMessage; */ public class SmbInboundOutboundSample extends AbstractBaseTests { - private static final String INBOUND_APPLICATION_CONTEXT_XML = "SmbInboundChannelAdapterSample-context.xml"; + private static final String INBOUND_APPLICATION_CONTEXT_XML = "SmbInboundChannelAdapterSample-context.xml"; + private static final String OUTBOUND_APPLICATION_CONTEXT_XML = "SmbOutboundChannelAdapterSample-context.xml"; @Ignore("Actual SMB share must be configured in file [" + INBOUND_APPLICATION_CONTEXT_XML + "].") diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java index a45c6ccc6e..6f8819a3a8 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.Charset; import java.util.Iterator; import java.util.Set; @@ -33,6 +31,8 @@ import org.springframework.integration.smb.session.SmbSessionFactory; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.MessageHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Markus Spann * @author Gunnar Hillert diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests.java index 18fab7a55e..1541013223 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundGatewayParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; @@ -42,6 +40,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * Unit tests follow original logic for testing SFTP module, * adapted for SMB module. diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests.java index 761e456ca0..f515c02190 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbStreamingInboundChannelAdapterParserTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.smb.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Iterator; import java.util.Set; @@ -42,6 +38,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * Unit tests follow original logic for testing SFTP module, * adapted for SMB module. diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/dsl/SmbTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/dsl/SmbTests.java index aa511c9d3a..72acc03180 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/dsl/SmbTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/dsl/SmbTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.smb.dsl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -29,6 +27,9 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; +import jcifs.smb.SmbException; +import jcifs.smb.SmbFile; +import jcifs.smb.SmbFileInputStream; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -61,9 +62,7 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import jcifs.smb.SmbException; -import jcifs.smb.SmbFile; -import jcifs.smb.SmbFileInputStream; +import static org.assertj.core.api.Assertions.assertThat; /** * diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTests.java index bfcc5b6df5..261bb27c22 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTests.java @@ -16,15 +16,12 @@ package org.springframework.integration.smb.inbound; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; +import jcifs.smb.SmbFile; import org.junit.Before; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -34,7 +31,9 @@ import org.springframework.integration.smb.AbstractBaseTests; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbSessionFactory; -import jcifs.smb.SmbFile; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Markus Spann @@ -118,7 +117,7 @@ public class SmbInboundRemoteFileSystemSynchronizerTests extends AbstractBaseTes }).when(smbSession).read(Mockito.eq(testRemoteDir + "/" + fileName), Mockito.any(OutputStream.class)); } - when(smbSession.list(testRemoteDir)).thenReturn(smbFiles.toArray(new SmbFile[] { })); + when(smbSession.list(testRemoteDir)).thenReturn(smbFiles.toArray(new SmbFile[] {})); when(smbSession.remove(Mockito.anyString())).thenReturn(true); return smbSession; diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java index 41fb8e2c60..69f721d6e6 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTests.java @@ -16,15 +16,11 @@ package org.springframework.integration.smb.outbound; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.InputStream; import java.io.OutputStream; +import jcifs.smb.SmbFile; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,7 +36,10 @@ import org.springframework.integration.smb.session.SmbSessionFactory; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileSystemUtils; -import jcifs.smb.SmbFile; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Markus Spann diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java index 73f8809613..a0f91747d6 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java @@ -16,16 +16,13 @@ package org.springframework.integration.smb.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.File; import java.io.InputStream; import java.io.OutputStream; +import jcifs.CIFSContext; +import jcifs.context.SingletonContext; +import jcifs.smb.SmbFile; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,9 +37,11 @@ import org.springframework.integration.smb.AbstractBaseTests; import org.springframework.messaging.support.GenericMessage; import org.springframework.util.FileSystemUtils; -import jcifs.CIFSContext; -import jcifs.context.SingletonContext; -import jcifs.smb.SmbFile; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Gregory Bragg diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionTests.java index 391e2a0389..a8b8c3157c 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionTests.java @@ -16,15 +16,14 @@ package org.springframework.integration.smb.session; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; +import jcifs.smb.SmbFile; import org.junit.jupiter.api.Test; import org.springframework.integration.smb.SmbTestSupport; -import jcifs.smb.SmbFile; +import static org.assertj.core.api.Assertions.assertThat; /** * diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java index bacd4982a7..7ef57952e6 100644 --- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java +++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java @@ -280,7 +280,8 @@ public abstract class AbstractStompSessionManager implements StompSessionManager } this.stompSessionFuture.whenComplete(new BiConsumer() { - @Override public void accept(StompSession session, Throwable throwable) { + @Override + public void accept(StompSession session, Throwable throwable) { if (session != null) { session.disconnect(); } diff --git a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/support/package-info.java b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/support/package-info.java index 9c357804dc..ac16b72b1f 100644 --- a/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/support/package-info.java +++ b/spring-integration-stomp/src/main/java/org/springframework/integration/stomp/support/package-info.java @@ -1,6 +1,5 @@ /** * Provides classes to support STOMP components. - * @author Artem Bilan * @since 4.2 */ diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java index 1d19e2d90e..e8cb89e247 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/StompSessionManagerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.stomp; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -32,6 +29,9 @@ import org.springframework.messaging.simp.stomp.StompSessionHandler; import org.springframework.messaging.simp.stomp.StompSessionHandlerAdapter; import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Artem Bilan * diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java index 30a6ab324b..7e09afec50 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/client/StompServerIntegrationTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.stomp.client; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; @@ -59,6 +56,9 @@ import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/config/StompAdaptersParserTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/config/StompAdaptersParserTests.java index 322f1c5685..0664cda696 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/config/StompAdaptersParserTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/config/StompAdaptersParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.stomp.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.List; @@ -38,6 +36,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -121,7 +121,7 @@ public class StompAdaptersParserTests { assertThat(headerMapper).isNotNull(); assertThat(headerMapper).isNotSameAs(this.headerMapper); assertThat(TestUtils.getPropertyValue(headerMapper, "inboundHeaderNames", String[].class)) - .isEqualTo(new String[]{"bar", "foo"}); + .isEqualTo(new String[] {"bar", "foo"}); assertThat(TestUtils.getPropertyValue(this.customInboundAdapter, "payloadType", Class.class)) .isEqualTo(Integer.class); assertThat(TestUtils.getPropertyValue(this.customInboundAdapter, "autoStartup", Boolean.class)).isFalse(); diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java index d0360b3556..d10ca04b14 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/inbound/StompInboundChannelAdapterWebSocketIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.stomp.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.Map; @@ -79,6 +77,8 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -264,7 +264,7 @@ public class StompInboundChannelAdapterWebSocketIntegrationTests { handshakeHeaders.setOrigin("https://www.example.com/"); webSocketStompSessionManager.setHandshakeHeaders(handshakeHeaders); StompHeaders stompHeaders = new StompHeaders(); - stompHeaders.setHeartbeat(new long[]{10000, 10000}); + stompHeaders.setHeartbeat(new long[] {10000, 10000}); webSocketStompSessionManager.setConnectHeaders(stompHeaders); return webSocketStompSessionManager; } diff --git a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java index ab982f54e5..decdfcac33 100644 --- a/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java +++ b/spring-integration-stomp/src/test/java/org/springframework/integration/stomp/outbound/StompMessageHandlerWebSocketIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.stomp.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -79,6 +77,8 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java index 43b72e48ee..26ddbce716 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.stream; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.ByteArrayInputStream; import org.junit.Test; @@ -26,6 +23,9 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java index 4017bf56cd..7f8a5082db 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.stream; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,6 +30,9 @@ import org.springframework.integration.test.util.OnlyOnceTrigger; import org.springframework.messaging.support.GenericMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan @@ -74,7 +74,7 @@ public class ByteStreamWritingMessageHandlerTests { @Test public void singleByteArray() { - handler.handleMessage(new GenericMessage(new byte[] { 1, 2, 3 })); + handler.handleMessage(new GenericMessage(new byte[] {1, 2, 3})); byte[] result = stream.toByteArray(); assertThat(result.length).isEqualTo(3); assertThat(result[0]).isEqualTo((byte) 1); @@ -94,9 +94,9 @@ public class ByteStreamWritingMessageHandlerTests { public void maxMessagesPerTaskSameAsMessageCount() { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(3); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -110,9 +110,9 @@ public class ByteStreamWritingMessageHandlerTests { public void maxMessagesPerTaskLessThanMessageCount() { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(2); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -126,9 +126,9 @@ public class ByteStreamWritingMessageHandlerTests { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(5); endpoint.setReceiveTimeout(0); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -142,9 +142,9 @@ public class ByteStreamWritingMessageHandlerTests { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(2); endpoint.setReceiveTimeout(0); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -166,9 +166,9 @@ public class ByteStreamWritingMessageHandlerTests { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(5); endpoint.setReceiveTimeout(0); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -189,9 +189,9 @@ public class ByteStreamWritingMessageHandlerTests { endpoint.setMaxMessagesPerPoll(2); endpoint.setTrigger(trigger); endpoint.setReceiveTimeout(0); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); @@ -212,15 +212,15 @@ public class ByteStreamWritingMessageHandlerTests { endpoint.setTrigger(trigger); endpoint.setMaxMessagesPerPoll(2); endpoint.setReceiveTimeout(0); - channel.send(new GenericMessage(new byte[] { 1, 2, 3 }), 0); - channel.send(new GenericMessage(new byte[] { 4, 5, 6 }), 0); - channel.send(new GenericMessage(new byte[] { 7, 8, 9 }), 0); + channel.send(new GenericMessage(new byte[] {1, 2, 3}), 0); + channel.send(new GenericMessage(new byte[] {4, 5, 6}), 0); + channel.send(new GenericMessage(new byte[] {7, 8, 9}), 0); endpoint.start(); trigger.await(); endpoint.stop(); byte[] result1 = stream.toByteArray(); assertThat(result1.length).isEqualTo(6); - stream.write(new byte[] { 123 }); + stream.write(new byte[] {123}); stream.flush(); trigger.reset(); endpoint.start(); diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java index 8cf678ec47..a9ef79322f 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.stream; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.io.StringReader; import java.time.Duration; import java.util.concurrent.CountDownLatch; @@ -36,6 +31,11 @@ import org.springframework.messaging.Message; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java index 58cd098c16..68266c329e 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.stream; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.io.StringWriter; import java.time.Instant; import java.util.concurrent.CountDownLatch; @@ -37,6 +34,9 @@ import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java index 507c506430..3c5e608033 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.stream.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStreamReader; @@ -37,6 +35,8 @@ import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gunnar Hillert diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java index 2af962fe4e..a50af25134 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.stream.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStreamWriter; @@ -47,6 +42,11 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests.java index f8c328197c..a535763459 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.stream.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java index 077a82ae5f..30619d4aac 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424MessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,8 +85,8 @@ public class RFC5424MessageConverter extends DefaultMessageConverter { } AbstractIntegrationMessageBuilder builder = getMessageBuilderFactory().withPayload( - asMap() ? map : originalContent) - .copyHeaders(message.getHeaders()); + asMap() ? map : originalContent) + .copyHeaders(message.getHeaders()); if (!asMap() && isMap) { builder.copyHeaders(map); } diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java index 6b142d16a3..a749f642f1 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/RFC5424SyslogParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -368,5 +368,4 @@ public class RFC5424SyslogParser { } - } diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java index e48b46b6e7..08747605a3 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.syslog.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.lang.reflect.Method; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -46,6 +43,9 @@ import org.springframework.messaging.PollableChannel; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogDeserializerTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogDeserializerTests.java index d032949444..8c848b5b23 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogDeserializerTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogDeserializerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.syslog.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.util.List; import java.util.Map; @@ -26,6 +24,8 @@ import org.junit.Test; import org.springframework.integration.syslog.SyslogHeaders; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Duncan McIntyre * @author Gary Russell @@ -36,17 +36,22 @@ public class SyslogDeserializerTests { static final String VALID_UNFRAMED_ENTRY = "<14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - - Removing instance\n"; + static final String VALID_FRAMED_ENTRY = "106 <14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - - Removing instance"; + static final String SHORT_FRAMED_ENTRY = "107 <14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - - Removing instance"; + static final String SD_ENTRY_1 = "179 <14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - " + "[exampleSDID@32473 iut=\\\"3\\\" eventSource=\\\"Application\\\" eventID=\\\"1011\\\"] Removing instance"; + static final String SD_ENTRY_2 = "253 <14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - " + "[exampleSDID@32473 iut=\\\"3\\\" eventSource=\\\"Application\\\" eventID=\\\"1011\\\"][exampleSDID@32473 " + "iut=\\\"3\\\" eventSource=\\\"Application\\\" eventID=\\\"1011\\\"] Removing instance"; + static final String SD_ENTRY_3 = "275 <14>1 2014-06-20T09:14:07+00:00 loggregator d0602076-b14a-4c55-852a-981e7afeed38 DEA - " + "[exampleSDID@32473 iut=\\\"3\\\" eventSource=\\\"Application\\\" eventID=\\\"1011\\\"][exampleSDID@32473 " + "iut=\\\"3\\\" eventSource=\\\"Application\\\" escapedBracket=\\\"\\]\\\" eventID=\\\"1011\\\"] Removing instance"; diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java index 55c1db7f0d..0c92034e3b 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.syslog.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import java.net.DatagramPacket; import java.net.DatagramSocket; import java.net.InetSocketAddress; @@ -55,6 +47,14 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; + /** * @author Gary Russell * @author David Liu diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LogLevels.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LogLevels.java index bb8f9c203d..a38e90df2c 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LogLevels.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LogLevels.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2019-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.junit.jupiter.api.extension.ExtendWith; * */ @ExtendWith(LogLevelsCondition.class) -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface LogLevels { diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LongRunningTest.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LongRunningTest.java index 440d03709f..8163a023bc 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LongRunningTest.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/condition/LongRunningTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import org.springframework.test.context.junit.jupiter.EnabledIf; * * @since 5.1 */ -@Target({ ElementType.TYPE, ElementType.METHOD }) +@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @EnabledIf("#{environment['RUN_LONG_INTEGRATION_TESTS'] == 'true'}") public @interface LongRunningTest { diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MapContentMatchers.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MapContentMatchers.java index 8dd38e2728..be94943cc8 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MapContentMatchers.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MapContentMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,7 +88,7 @@ public final class MapContentMatchers extends TypeSafeMatcher[] classes, String[] categories) { diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java index f00016d535..efceadd475 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.test.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Before; @@ -32,6 +30,8 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * Convenience class for testing Spring Integration request-response message scenarios. * Users create subclasses to execute on or more {@link RequestResponseScenario} tests. diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java index cd3087c166..5577e9f1ee 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ public class LongRunningIntegrationTest extends TestWatcher { private boolean shouldRun = false; public LongRunningIntegrationTest() { - for (String value: new String[]{System.getenv(RUN_LONG_PROP), System.getProperty(RUN_LONG_PROP)}) { + for (String value : new String[] {System.getenv(RUN_LONG_PROP), System.getProperty(RUN_LONG_PROP)}) { if ("true".equalsIgnoreCase(value)) { this.shouldRun = true; break; diff --git a/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java b/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java index 6a50da35d7..a74a47bf53 100644 --- a/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java +++ b/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.test.matcher; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.util.Date; import org.hamcrest.Matchers; @@ -36,6 +31,11 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.MessageBuilder; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Alex Peters * @author Iwein Fuld diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java b/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java index 755467d796..b03f8ec942 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java @@ -23,6 +23,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import reactor.util.function.Tuple2; +import reactor.util.function.Tuples; + import org.springframework.beans.BeansException; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; @@ -45,9 +48,6 @@ import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; -import reactor.util.function.Tuple2; -import reactor.util.function.Tuples; - /** * A {@link BeanFactoryAware} component with an API to customize real beans * in the application context from test code. diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/context/SpringIntegrationTest.java b/spring-integration-test/src/main/java/org/springframework/integration/test/context/SpringIntegrationTest.java index 8e7779cf5e..c6f9dd13df 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/context/SpringIntegrationTest.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/context/SpringIntegrationTest.java @@ -75,6 +75,6 @@ public @interface SpringIntegrationTest { * @see SpringIntegrationTestExecutionListener * @see org.springframework.util.PatternMatchUtils */ - String[] noAutoStartup() default { }; + String[] noAutoStartup() default {}; } diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/CachedSpringIntegrationTestAnnotationTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/CachedSpringIntegrationTestAnnotationTests.java index 6d4d1d5ede..683cafe461 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/CachedSpringIntegrationTestAnnotationTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/CachedSpringIntegrationTestAnnotationTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.test.mock; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +26,8 @@ import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.test.context.SpringIntegrationTest; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageHandlerTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageHandlerTests.java index 633dc78f7c..91e70dfbcf 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageHandlerTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,6 @@ package org.springframework.integration.test.mock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.springframework.integration.test.mock.MockIntegration.mockMessageHandler; - import java.util.List; import java.util.Map; @@ -62,6 +54,14 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.springframework.integration.test.mock.MockIntegration.mockMessageHandler; + /** * @author Artem Bilan * @author Yicheng Feng @@ -185,7 +185,8 @@ public class MockMessageHandlerTests { ArgumentCaptor> messageArgumentCaptor = MockIntegration.messageArgumentCaptor(); MessageHandler mockMessageHandler = spy(mockMessageHandler(messageArgumentCaptor)) - .handleNext(m -> { }); + .handleNext(m -> { + }); String endpointId = "rawHandlerConsumer"; this.mockIntegrationContext.substituteMessageHandlerFor(endpointId, mockMessageHandler); @@ -245,7 +246,8 @@ public class MockMessageHandlerTests { @SuppressWarnings("unchecked") public void testMockIntegrationContextReset() { MockMessageHandler mockMessageHandler = mockMessageHandler(); - mockMessageHandler.handleNext(message -> { }); + mockMessageHandler.handleNext(message -> { + }); this.mockIntegrationContext.substituteMessageHandlerFor("logEndpoint", mockMessageHandler); diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageSourceTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageSourceTests.java index 23c1e49525..6c3357547f 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageSourceTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/mock/MockMessageSourceTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.test.mock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -47,13 +44,16 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * * @since 5.0 */ @SpringJUnitConfig(classes = MockMessageSourceTests.Config.class) -@SpringIntegrationTest(noAutoStartup = { "inboundChannelAdapter", "*Source*" }) +@SpringIntegrationTest(noAutoStartup = {"inboundChannelAdapter", "*Source*"}) @DirtiesContext public class MockMessageSourceTests { diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/IntegrationHandlerResultHandler.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/IntegrationHandlerResultHandler.java index e3a612bf59..5612363e94 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/IntegrationHandlerResultHandler.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/IntegrationHandlerResultHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2019 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +16,14 @@ package org.springframework.integration.webflux.inbound; +import reactor.core.publisher.Mono; + import org.springframework.core.Ordered; import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.HandlerResult; import org.springframework.web.reactive.HandlerResultHandler; import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; - /** * A {@link HandlerResultHandler} implementation to handle the result of the * {@link WebFluxInboundEndpoint} execution. Actually just return the diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java index be4424140d..c9d738729a 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java @@ -28,6 +28,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.util.function.Tuple2; import org.springframework.core.ReactiveAdapter; import org.springframework.core.ReactiveAdapterRegistry; @@ -62,10 +65,6 @@ import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.UnsupportedMediaTypeStatusException; import org.springframework.web.server.WebHandler; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.util.function.Tuple2; - /** * A {@link org.springframework.integration.gateway.MessagingGatewaySupport} * implementation for Spring WebFlux HTTP requests execution. diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java index 75c215e97c..076a57f2b8 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java @@ -20,6 +20,8 @@ import java.net.URI; import java.util.Map; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.io.Resource; @@ -47,9 +49,6 @@ import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.util.DefaultUriBuilderFactory; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - /** * A {@link org.springframework.messaging.MessageHandler} implementation that executes * HTTP requests by delegating to a Reactive {@link WebClient} instance. @@ -307,7 +306,7 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx .toEntityFlux(createBodyExtractor(expectedResponseType)); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) private BodyExtractor, ? super ClientHttpResponse> createBodyExtractor(Object expectedResponseType) { if (expectedResponseType != null) { if (this.replyPayloadToFlux) { diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests.java index a796afc7bd..b62ea5715a 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.webflux.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -39,6 +37,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.validation.Validator; import org.springframework.web.reactive.accept.RequestedContentTypeResolver; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -119,7 +119,7 @@ public class WebFluxInboundChannelAdapterParserTests { CrossOrigin crossOrigin = (CrossOrigin) endpointAccessor.getPropertyValue("crossOrigin"); assertThat(crossOrigin).isNotNull(); - assertThat(crossOrigin.getOrigin()).isEqualTo(new String[]{ "foo" }); + assertThat(crossOrigin.getOrigin()).isEqualTo(new String[] {"foo"}); assertThat(endpointAccessor.getPropertyValue("requestPayloadType")) .isEqualTo(ResolvableType.forClass(byte[].class)); diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests.java index 433e82ed89..dd1479191a 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.webflux.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.jupiter.api.Test; @@ -38,6 +36,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.web.reactive.accept.RequestedContentTypeResolver; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -114,7 +114,7 @@ public class WebFluxInboundGatewayParserTests { CrossOrigin crossOrigin = (CrossOrigin) endpointAccessor.getPropertyValue("crossOrigin"); assertThat(crossOrigin).isNotNull(); - assertThat(crossOrigin.getOrigin()).isEqualTo(new String[]{ "foo" }); + assertThat(crossOrigin.getOrigin()).isEqualTo(new String[] {"foo"}); assertThat(endpointAccessor.getPropertyValue("requestPayloadType")) .isEqualTo(ResolvableType.forClass(byte[].class)); diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java index 42d6fb81b7..aabad6134c 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.webflux.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; import java.util.Date; @@ -36,6 +34,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.util.DefaultUriBuilderFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java index 319e8fd74f..0887625592 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/config/WebFluxOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2021 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.webflux.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; import java.util.Map; @@ -38,6 +36,8 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.reactive.function.BodyExtractor; import org.springframework.web.reactive.function.client.WebClient; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java index 95bf4b2210..554363dbe5 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.webflux.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; - import java.security.Principal; import java.time.Duration; import java.util.Collections; @@ -30,6 +25,9 @@ import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.reactivestreams.Publisher; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; @@ -88,9 +86,10 @@ import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClientResponseException; import org.springframework.web.util.UriComponentsBuilder; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; /** * @author Artem Bilan @@ -472,7 +471,7 @@ public class WebFluxDslTests { .from(WebFlux.inboundGateway("/sse") .requestMapping(m -> m.produces(MediaType.TEXT_EVENT_STREAM_VALUE)) .mappedResponseHeaders("*")) - .enrichHeaders(Collections.singletonMap("aHeader", new String[]{ "foo", "bar", "baz" })) + .enrichHeaders(Collections.singletonMap("aHeader", new String[] {"foo", "bar", "baz"})) .handle((p, h) -> Flux.fromArray(h.get("aHeader", String[].class))) .get(); } diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpointTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpointTests.java index 36b3a2e8d1..490f466daf 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpointTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2020 the original author or authors. + * Copyright 2017-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,10 @@ package org.springframework.integration.webflux.inbound; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -38,10 +41,6 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.web.reactive.config.EnableWebFlux; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import reactor.core.publisher.Flux; - /** * @author Artem Bilan * diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java index 29c5331848..99b9ad2cf2 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java @@ -16,12 +16,13 @@ package org.springframework.integration.webflux.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.charset.StandardCharsets; import java.time.Duration; import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; @@ -43,9 +44,7 @@ import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClientResponseException; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Shiliang Li diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java index 806b9001f9..95d436ddaf 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/IntegrationWebSocketContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -181,8 +181,8 @@ public abstract class IntegrationWebSocketContainer implements DisposableBean { IntegrationWebSocketContainer.this.sessions.put(session.getId(), session); if (IntegrationWebSocketContainer.this.logger.isDebugEnabled()) { - IntegrationWebSocketContainer.this.logger.debug("Started WebSocket session = " + - session.getId() + ", number of sessions = " + + IntegrationWebSocketContainer.this.logger.debug("Started WebSocket session = " + + session.getId() + ", number of sessions = " + IntegrationWebSocketContainer.this.sessions.size()); } if (IntegrationWebSocketContainer.this.messageListener != null) { diff --git a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketAdapterParsingUtils.java b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketAdapterParsingUtils.java index 8a2c9bd4f3..f4a3777a60 100644 --- a/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketAdapterParsingUtils.java +++ b/spring-integration-websocket/src/main/java/org/springframework/integration/websocket/config/WebSocketAdapterParsingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ abstract class WebSocketAdapterParsingUtils { } BeanDefinitionBuilder protocolHandlerRegistryBuilder = BeanDefinitionBuilder.genericBeanDefinition(SubProtocolHandlerRegistry.class) - .addConstructorArgValue(protocolHandlerList); + .addConstructorArgValue(protocolHandlerList); if (hasDefaultProtocolHandler) { protocolHandlerRegistryBuilder.addConstructorArgReference(defaultProtocolHandler); } diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java index 64c8300f24..a944b76193 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/ClientWebSocketContainerTests.java @@ -17,9 +17,6 @@ package org.springframework.integration.websocket; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.net.URI; import java.util.Collections; import java.util.HashMap; @@ -46,6 +43,9 @@ import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.client.standard.StandardWebSocketClient; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java index d4c14b5cf7..78fa3c2f8b 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/StompIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.websocket.client; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -95,6 +93,8 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/WebSocketClientTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/WebSocketClientTests.java index 89a3d60aa6..14b642b270 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/WebSocketClientTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/client/WebSocketClientTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.websocket.client; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -60,6 +58,8 @@ import org.springframework.web.socket.messaging.SubProtocolHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java index fd501db04e..84b7272814 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/config/WebSocketParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.websocket.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.URI; import java.net.URISyntaxException; import java.util.Arrays; @@ -58,6 +56,8 @@ import org.springframework.web.socket.sockjs.transport.TransportHandler; import org.springframework.web.socket.sockjs.transport.TransportHandlingSockJsService; import org.springframework.web.socket.sockjs.transport.TransportType; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @@ -156,7 +156,7 @@ public class WebSocketParserTests { assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "sendTimeLimit")).isEqualTo(100); assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "sendBufferSizeLimit")).isEqualTo(100000); assertThat(TestUtils.getPropertyValue(this.serverWebSocketContainer, "origins", String[].class)) - .isEqualTo(new String[]{ "https://foo.com" }); + .isEqualTo(new String[] {"https://foo.com"}); WebSocketHandlerDecoratorFactory[] decoratorFactories = TestUtils.getPropertyValue(this.serverWebSocketContainer, "decoratorFactories", diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/dsl/WebSocketDslTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/dsl/WebSocketDslTests.java index 19ab57e396..2994acf072 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/dsl/WebSocketDslTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/dsl/WebSocketDslTests.java @@ -16,12 +16,7 @@ package org.springframework.integration.websocket.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.awaitility.Awaitility.await; - import jakarta.websocket.DeploymentException; - import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -48,6 +43,10 @@ import org.springframework.web.socket.server.HandshakeHandler; import org.springframework.web.socket.server.standard.TomcatRequestUpgradeStrategy; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.awaitility.Awaitility.await; + @SpringJUnitConfig(classes = WebSocketDslTests.ClientConfig.class) @DirtiesContext public class WebSocketDslTests { diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapterTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapterTests.java index f4e6156ece..9dca769b7d 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapterTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/inbound/WebSocketInboundChannelAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.websocket.inbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.nio.ByteBuffer; import java.util.Collections; import java.util.Map; @@ -56,6 +54,8 @@ import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.Transport; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/outbound/WebSocketOutboundMessageHandlerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/outbound/WebSocketOutboundMessageHandlerTests.java index 1aabd92dfa..ee33ccfd5b 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/outbound/WebSocketOutboundMessageHandlerTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/outbound/WebSocketOutboundMessageHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.websocket.outbound; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collections; import org.junit.jupiter.api.Test; @@ -48,6 +46,8 @@ import org.springframework.web.socket.messaging.SubProtocolHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java index 4bee3052cd..a2efc74dad 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/server/WebSocketServerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.websocket.server; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; @@ -88,6 +83,11 @@ import org.springframework.web.socket.server.support.DefaultHandshakeHandler; import org.springframework.web.socket.sockjs.client.SockJsClient; import org.springframework.web.socket.sockjs.client.WebSocketTransport; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Artem Bilan * diff --git a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/support/SubProtocolHandlerRegistryTests.java b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/support/SubProtocolHandlerRegistryTests.java index 9ba86bb075..e0bf4a4b8e 100644 --- a/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/support/SubProtocolHandlerRegistryTests.java +++ b/spring-integration-websocket/src/test/java/org/springframework/integration/websocket/support/SubProtocolHandlerRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,6 @@ package org.springframework.integration.websocket.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - import java.util.Collections; import org.junit.jupiter.api.Test; @@ -33,6 +27,12 @@ import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.messaging.StompSubProtocolHandler; import org.springframework.web.socket.messaging.SubProtocolHandler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + /** * @author Artem Bilan * diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/BaseWsInboundGatewaySpec.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/BaseWsInboundGatewaySpec.java index fa0e02320e..ed4b688fd6 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/BaseWsInboundGatewaySpec.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/BaseWsInboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.integration.ws.SoapHeaderMapper; */ public abstract class BaseWsInboundGatewaySpec< S extends BaseWsInboundGatewaySpec, E extends AbstractWebServiceInboundGateway> - extends MessagingGatewaySpec { + extends MessagingGatewaySpec { /** * Construct an instance. diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/MarshallingWsInboundGatewaySpec.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/MarshallingWsInboundGatewaySpec.java index 70d47c887e..9bdafa5047 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/MarshallingWsInboundGatewaySpec.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/MarshallingWsInboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.oxm.Unmarshaller; * */ public class MarshallingWsInboundGatewaySpec extends BaseWsInboundGatewaySpec { + MarshallingWebServiceInboundGateway> { protected Marshaller gatewayMarshaller; // NOSONAR diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/SimpleWsInboundGatewaySpec.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/SimpleWsInboundGatewaySpec.java index 258e1486a8..77bbe11e21 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/SimpleWsInboundGatewaySpec.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/dsl/SimpleWsInboundGatewaySpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.integration.ws.SimpleWebServiceInboundGateway; * */ public class SimpleWsInboundGatewaySpec extends BaseWsInboundGatewaySpec { + SimpleWebServiceInboundGateway> { protected boolean extractPayload = true; // NOSONAR diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/DefaultSoapHeaderMapperTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/DefaultSoapHeaderMapperTests.java index a4f6dda590..d9b26a3606 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/DefaultSoapHeaderMapperTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/DefaultSoapHeaderMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.ByteArrayInputStream; import java.util.HashMap; import java.util.Iterator; @@ -33,7 +29,6 @@ import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.MimeHeaders; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; - import org.junit.Test; import org.w3c.dom.NodeList; @@ -46,6 +41,10 @@ import org.springframework.ws.transport.TransportConstants; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Gary Russell * @author Mauro Molinari diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java index 7cdca373df..853ab7e0b1 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -46,6 +43,9 @@ import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.when; + /** * * @author Iwein Fuld diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java index 60a94fa125..d885113bdc 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,6 @@ package org.springframework.integration.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.StringReader; import java.io.StringWriter; @@ -48,6 +39,15 @@ import org.springframework.messaging.MessageDeliveryException; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld */ diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java index 36b5b5120e..eb99921b96 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.mockito.Mockito.mock; - import java.io.ByteArrayInputStream; import java.io.InputStreamReader; import java.net.URI; @@ -32,7 +28,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import jakarta.xml.soap.MessageFactory; - import org.junit.Test; import org.mockito.Mockito; @@ -64,6 +59,10 @@ import org.springframework.ws.transport.WebServiceMessageSender; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.mockito.Mockito.mock; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/WebServiceInboundGatewayJavaConfigTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/WebServiceInboundGatewayJavaConfigTests.java index 1cdd171d92..b284d47e79 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/WebServiceInboundGatewayJavaConfigTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/WebServiceInboundGatewayJavaConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,6 @@ package org.springframework.integration.ws; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import java.io.StringWriter; import java.util.Locale; @@ -66,6 +59,13 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; import org.springframework.ws.transport.WebServiceMessageReceiver; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + /** * @author Artem Bilan * @since 4.3 diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests.java index 0cc5ae72dd..b7f76afec2 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMessageFactory.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMessageFactory.java index aac732fbc8..4db33f4776 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMessageFactory.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubMessageFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ws.config; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -36,6 +33,9 @@ import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.pox.dom.DomPoxMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Mark Fisher */ diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index 15e2720367..1d7bfd7b64 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.BDDMockito.willThrow; -import static org.mockito.Mockito.doAnswer; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -34,7 +29,6 @@ import jakarta.jms.JMSException; import jakarta.jms.MessageProducer; import jakarta.jms.Queue; import jakarta.jms.Session; - import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Stanza; import org.junit.jupiter.api.Test; @@ -65,6 +59,11 @@ import org.springframework.ws.transport.context.TransportContext; import org.springframework.ws.transport.context.TransportContextHolder; import org.springframework.ws.transport.mail.MailSenderConnection; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.doAnswer; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java index f0b414a342..78c0e2c452 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java index c82bc91ed6..217434b75d 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Collections; import java.util.Map; import java.util.Properties; @@ -49,6 +45,10 @@ import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + /** * @author Iwein Fuld * @author Oleg Zhurakousky diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java index 585139b552..0446a71ace 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java @@ -16,15 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import java.time.Duration; import org.junit.jupiter.api.Test; @@ -62,6 +53,15 @@ import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.client.support.interceptor.ClientInterceptor; import org.springframework.ws.transport.WebServiceMessageSender; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Oleg Zhurakousky diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java index 5a52421a9a..c2e57fd2c5 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.ws.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; @@ -64,6 +62,8 @@ import org.springframework.ws.transport.WebServiceMessageSender; import org.springframework.xml.namespace.QNameUtils; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -91,7 +91,7 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { public void headerMapperParserTest() throws Exception { SimpleWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(this.context.getBean("withHeaderMapper"), - "handler", SimpleWebServiceOutboundGateway.class); + "handler", SimpleWebServiceOutboundGateway.class); DefaultSoapHeaderMapper headerMapper = TestUtils.getPropertyValue(gateway, "headerMapper", DefaultSoapHeaderMapper.class); assertThat(headerMapper).isNotNull(); @@ -201,7 +201,7 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { private Message process(Object payload, String gatewayName, String channelName, final boolean soap) throws Exception { AbstractWebServiceOutboundGateway gateway = TestUtils.getPropertyValue(this.context.getBean(gatewayName), "handler", - AbstractWebServiceOutboundGateway.class); + AbstractWebServiceOutboundGateway.class); if (!soap) { WebServiceTemplate template = TestUtils.getPropertyValue(gateway, "webServiceTemplate", WebServiceTemplate.class); @@ -215,8 +215,8 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { Mockito.doAnswer(invocation -> { - Object[] args = invocation.getArguments(); - WebServiceMessage wsMessage = (WebServiceMessage) args[0]; + Object[] args = invocation.getArguments(); + WebServiceMessage wsMessage = (WebServiceMessage) args[0]; // try { // uncomment if you want to see a pretty-print of SOAP message // Transformer transformer = TransformerFactory.newInstance().newTransformer(); // transformer.setOutputProperty(OutputKeys.INDENT, "yes"); @@ -225,16 +225,16 @@ public class WebServiceOutboundGatewayWithHeaderMapperTests { // catch (Exception e) { // // ignore // } - if (soap) { - SoapHeader soapHeader = ((SoapMessage) wsMessage).getSoapHeader(); - assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("foo"))).isNotNull(); - assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("foobar"))).isNotNull(); - assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("abaz"))).isNotNull(); - assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("bar"))).isNull(); - } - return null; + if (soap) { + SoapHeader soapHeader = ((SoapMessage) wsMessage).getSoapHeader(); + assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("foo"))).isNotNull(); + assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("foobar"))).isNotNull(); + assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("abaz"))).isNotNull(); + assertThat(soapHeader.getAttributeValue(QNameUtils.parseQNameString("bar"))).isNull(); + } + return null; - }).when(wsConnection) + }).when(wsConnection) .send(Mockito.any(WebServiceMessage.class)); Mockito.doAnswer(invocation -> { diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/dsl/WsDslTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/dsl/WsDslTests.java index 65ff0a3f97..6e2994d77f 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/dsl/WsDslTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/dsl/WsDslTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.ws.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.HashMap; import java.util.Map; @@ -44,6 +41,9 @@ import org.springframework.ws.client.support.destination.DestinationProvider; import org.springframework.ws.client.support.interceptor.ClientInterceptor; import org.springframework.ws.transport.WebServiceMessageSender; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan @@ -87,7 +87,8 @@ public class WsDslTests { SoapHeaderMapper headerMapper = mock(SoapHeaderMapper.class); ClientInterceptor interceptor = mock(ClientInterceptor.class); WebServiceMessageSender messageSender = mock(WebServiceMessageSender.class); - WebServiceMessageCallback requestCallback = msg -> { }; + WebServiceMessageCallback requestCallback = msg -> { + }; Map uriVariableExpressions = new HashMap<>(); uriVariableExpressions.put("foo", new LiteralExpression("bar")); MarshallingWebServiceOutboundGateway gateway = @@ -127,7 +128,8 @@ public class WsDslTests { SoapHeaderMapper headerMapper = mock(SoapHeaderMapper.class); ClientInterceptor interceptor = mock(ClientInterceptor.class); WebServiceMessageSender messageSender = mock(WebServiceMessageSender.class); - WebServiceMessageCallback requestCallback = msg -> { }; + WebServiceMessageCallback requestCallback = msg -> { + }; Map uriVariableExpressions = new HashMap<>(); uriVariableExpressions.put("foo", new LiteralExpression("bar")); SourceExtractor sourceExtractor = mock(SourceExtractor.class); @@ -163,7 +165,8 @@ public class WsDslTests { @Test void marshallingOutboundTemplate() { SoapHeaderMapper headerMapper = mock(SoapHeaderMapper.class); - WebServiceMessageCallback requestCallback = msg -> { }; + WebServiceMessageCallback requestCallback = msg -> { + }; Map uriVariableExpressions = new HashMap<>(); uriVariableExpressions.put("foo", new LiteralExpression("bar")); WebServiceTemplate template = mock(WebServiceTemplate.class); @@ -189,7 +192,8 @@ public class WsDslTests { @Test void simpleOutboundTemplate() { SoapHeaderMapper headerMapper = mock(SoapHeaderMapper.class); - WebServiceMessageCallback requestCallback = msg -> { }; + WebServiceMessageCallback requestCallback = msg -> { + }; Map uriVariableExpressions = new HashMap<>(); uriVariableExpressions.put("foo", new LiteralExpression("bar")); SourceExtractor sourceExtractor = mock(SourceExtractor.class); diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java index 15f00f2a80..80a405045e 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XsltPayloadTransformerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,7 +78,7 @@ public class XsltPayloadTransformerParser extends AbstractTransformerParser { String expression = xslParameterElement.getAttribute("expression"); String value = xslParameterElement.getAttribute("value"); Assert.isTrue(StringUtils.hasText(expression) ^ StringUtils.hasText(value), - "Exactly one of 'expression' or 'value' is required."); + "Exactly one of 'expression' or 'value' is required."); RootBeanDefinition expressionDef = null; if (StringUtils.hasText(value)) { expressionDef = new RootBeanDefinition("org.springframework.expression.common.LiteralExpression"); diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java index e38bf769c1..519fd7b69b 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,5 +42,4 @@ public class XPathHeaderEnricher extends HeaderEnricher { super(expressionMap); } - } diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/support/XPathExpressionEvaluatingHeaderValueMessageProcessor.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/support/XPathExpressionEvaluatingHeaderValueMessageProcessor.java index 30346acc54..3acac60488 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/support/XPathExpressionEvaluatingHeaderValueMessageProcessor.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/support/XPathExpressionEvaluatingHeaderValueMessageProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.xml.xpath.XPathExpressionFactory; * @author Artem Bilan * * @since 2.0 -*/ + */ public class XPathExpressionEvaluatingHeaderValueMessageProcessor implements HeaderValueMessageProcessor, BeanFactoryAware { diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java index 12e6126d56..67f9068a8f 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/XPathUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,7 +87,7 @@ public final class XPathUtils { * object can't be converted to a {@link Node}; * @throws XPathException - if the xpath expression can't be evaluated. */ - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({"unchecked"}) public static T evaluate(Object object, String xpath, Object... resultArg) { Object resultType = null; if (resultArg != null && resultArg.length > 0) { diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java index 849c4e2e8b..8005419b4e 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.xmlunit.assertj3.XmlAssert.assertThat; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -40,6 +37,9 @@ import org.xml.sax.InputSource; import org.springframework.core.io.ClassPathResource; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.xmlunit.assertj3.XmlAssert.assertThat; + /** * * @author Jonas Partner diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/ChainElementsTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/ChainElementsTests.java index 50cd442d76..2fa93c20a9 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/ChainElementsTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/ChainElementsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.util.Properties; @@ -33,6 +30,9 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; import org.springframework.integration.xml.transformer.XPathTransformer; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gunnar Hillert diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests.java index 57b30f3f47..a736184588 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/DefaultConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; @@ -34,6 +32,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ErrorHandler; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java index 89977d7e73..97cf30c666 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import javax.xml.transform.dom.DOMResult; @@ -40,12 +38,14 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MultiValueMap; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher * @author Gary Russell */ -public class MarshallingTransformerParserTests { +public class MarshallingTransformerParserTests { private ApplicationContext appContext; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java index 2f68c34e4e..e218134d52 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/TestXmlApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public class TestXmlApplicationContext extends AbstractXmlApplicationContext { @Override public InputStream getInputStream() throws IOException { - return new ByteArrayInputStream(xmlString.getBytes("UTF-8")); + return new ByteArrayInputStream(xmlString.getBytes("UTF-8")); } } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java index e47aa07665..cf8569a7be 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import javax.xml.transform.dom.DOMSource; @@ -40,6 +38,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MultiValueMap; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher @@ -127,8 +127,6 @@ public class UnmarshallingTransformerParserTests { } - - @Test(expected = MessagingException.class) public void testUnmarshallUnsupported() throws Exception { MessageChannel input = (MessageChannel) appContext.getBean("input"); diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java index 44ac1444e1..c6af1967b1 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathExpressionParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import org.junit.Test; import org.xml.sax.SAXParseException; @@ -26,6 +23,9 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + public class XPathExpressionParserTests { @Test @@ -170,5 +170,4 @@ public class XPathExpressionParserTests { return (XPathExpression) ctx.getBean("xpathExpression"); } - } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java index 78060e66c5..bd1074be76 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -41,6 +39,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java index 4734220e26..f54baa1bd8 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Map; @@ -43,6 +41,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java index 9aa6b979d3..25e3f2bb95 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import javax.xml.parsers.DocumentBuilderFactory; import org.junit.Test; @@ -36,6 +34,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner */ diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java index 98be237cb2..4dbe62a663 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.After; @@ -46,6 +44,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher @@ -57,7 +57,7 @@ import org.springframework.util.MultiValueMap; public class XPathRouterParserTests { String channelConfig = " " + - ""; + ""; @Autowired @Qualifier("test-input") MessageChannel inputChannel; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSplitterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSplitterParserTests.java index 5a9fffae23..8a2adc9eb0 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSplitterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathSplitterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import java.util.Properties; @@ -34,6 +32,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java index 0dc16e7265..c5fb1fb911 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.StringReader; import java.util.List; @@ -47,6 +45,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.MultiValueMap; import org.springframework.xml.xpath.NodeMapper; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java index f701138004..dfb566a611 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.List; import java.util.Locale; @@ -49,6 +46,9 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.MultiValueMap; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Jonas Partner * @author Oleg Zhurakousky diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java index 6e5dd2525d..ef18cd14c0 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import javax.xml.transform.dom.DOMResult; @@ -43,6 +41,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.util.MultiValueMap; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java index c5e1a0cd53..a7ab988170 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.router; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Test; @@ -30,13 +28,15 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner */ public class XPathRouterTests { @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void simpleSingleAttribute() throws Exception { Document doc = XmlTestUtil.getDocumentForString(""); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); @@ -47,7 +47,7 @@ public class XPathRouterTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void simpleSingleAttributeAsString() throws Exception { Document doc = XmlTestUtil.getDocumentForString(""); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/@type"); @@ -59,7 +59,7 @@ public class XPathRouterTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void simpleRootNode() throws Exception { Document doc = XmlTestUtil.getDocumentForString("olegbang"); XPathExpression expression = XPathExpressionFactory.createXPathExpression("name(./node())"); @@ -71,7 +71,7 @@ public class XPathRouterTests { } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void multipleNodeValues() throws Exception { Document doc = XmlTestUtil.getDocumentForString("bOnebTwo"); XPathExpression expression = XPathExpressionFactory.createXPathExpression("/doc/book"); @@ -84,7 +84,7 @@ public class XPathRouterTests { @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) /* * Will return only one (the first node text in the collection), since * the evaluation return type use is String (not NODESET) diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java index 1c4422f8eb..ad63af244e 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/BooleanTestXpathMessageSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -27,6 +25,8 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner */ diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java index fde08831f1..57d7f9a28b 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package org.springframework.integration.xml.selector; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner */ diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java index 66a18d1d51..ea82d50719 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelectorTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.xml.selector; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,6 +24,10 @@ import org.springframework.core.io.Resource; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xml.selector.XmlValidatingMessageSelector.SchemaType; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java index 89d506241c..3914b7af4a 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.source; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.xmlunit.assertj3.XmlAssert.assertThat; - import java.io.StringReader; import javax.xml.parsers.DocumentBuilderFactory; @@ -33,6 +30,9 @@ import org.xml.sax.InputSource; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.xmlunit.assertj3.XmlAssert.assertThat; + /** * @author Jonas Partner * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java index fd13824b78..b937e6b57a 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.source; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.xmlunit.assertj3.XmlAssert.assertThat; - import java.io.BufferedReader; import org.junit.jupiter.api.Test; @@ -28,6 +25,9 @@ import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.xmlunit.assertj3.XmlAssert.assertThat; + /** * @author Jonas Partner * @author Mark Fisher diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java index 3bcfa4ca67..54ec10eb0c 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.splitter; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.junit.Before; @@ -33,6 +31,8 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/CustomTestResultFactory.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/CustomTestResultFactory.java index 16839848c2..4c3b509244 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/CustomTestResultFactory.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/CustomTestResultFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2019 the original author or authors. + * Copyright 2016-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,5 +56,4 @@ public class CustomTestResultFactory implements ResultFactory { } - } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java index 29afe9abdd..e0e6904f63 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -34,6 +32,8 @@ import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher */ diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java index ee66dd46eb..81bcbd52df 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXResult; @@ -29,6 +27,8 @@ import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner */ diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java index 528fb61df3..14d32559b8 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.xmlunit.assertj3.XmlAssert.assertThat; - import java.util.Properties; import javax.xml.transform.OutputKeys; @@ -32,6 +29,9 @@ import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringResult; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.xmlunit.assertj3.XmlAssert.assertThat; + /** * @author Jonas Partner * @author Dave Turanski diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java index 510e72e35c..33a78adc33 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import javax.xml.transform.Source; @@ -32,6 +30,8 @@ import org.springframework.oxm.Unmarshaller; import org.springframework.oxm.XmlMappingException; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author Mark Fisher diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java index 3946998157..31e1ce6e45 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; import java.util.TimeZone; @@ -30,6 +28,8 @@ import org.springframework.integration.xml.xpath.XPathEvaluationType; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Jonas Partner * @author David Turanski diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java index aaff6fbe18..0a93a0fb09 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.StringReader; import java.util.List; @@ -39,6 +37,8 @@ import org.springframework.xml.xpath.NodeMapper; import org.springframework.xml.xpath.XPathExpression; import org.springframework.xml.xpath.XPathExpressionFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java index 3a0526a1b5..ca6f3356a5 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.xmlunit.assertj3.XmlAssert.assertThat; - import java.io.File; import java.io.IOException; @@ -49,6 +45,10 @@ import org.springframework.util.FileCopyUtils; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.xmlunit.assertj3.XmlAssert.assertThat; + /** * @author Jonas Partner diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java index 93516f357b..20a37ce2e6 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.xml.transformer; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.util.Properties; @@ -37,6 +35,8 @@ import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Jonas Partner diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbAnnotatedPerson.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbAnnotatedPerson.java index be979072af..d881e94f51 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbAnnotatedPerson.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbAnnotatedPerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,8 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; -@XmlType @XmlRootElement(name = "person") +@XmlType +@XmlRootElement(name = "person") public class JaxbAnnotatedPerson { private String firstName; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java index c647297e8b..3423df475e 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.transformer.jaxbmarshaling; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -41,6 +38,9 @@ import org.springframework.oxm.UnmarshallingFailureException; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * @author Jonas Partner * @author Artem Bilan diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/xpath/XPathTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/xpath/XPathTests.java index 1366cba1d1..1160949ddf 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/xpath/XPathTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/xpath/XPathTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 the original author or authors. + * Copyright 2013-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.xml.xpath; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Date; import java.util.List; @@ -40,6 +37,9 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.xml.xpath.NodeMapper; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Artem Bilan * @author Gary Russell diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java index 275573cfdb..67c88fb49e 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java @@ -96,7 +96,8 @@ public class ChatMessageListeningEndpoint extends AbstractXmppConnectionAwareEnd return "xmpp:inbound-channel-adapter"; } - @Override protected void onInit() { + @Override + protected void onInit() { super.onInit(); this.evaluationContext = ExpressionUtils.createStandardEvaluationContext(getBeanFactory()); } @@ -152,7 +153,7 @@ public class ChatMessageListeningEndpoint extends AbstractXmppConnectionAwareEnd if (ChatMessageListeningEndpoint.this.payloadExpression != null) { logger.info("The 'payloadExpression' [" + ChatMessageListeningEndpoint.this.payloadExpression.getExpressionString() - + "] has been evaluated to 'null'. The XMPP Message [" + xmppMessage + "] is ignored."); + + "] has been evaluated to 'null'. The XMPP Message [" + xmppMessage + "] is ignored."); } else { logger.info("The XMPP Message [" + xmppMessage + "] with empty body is ignored."); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java index 8c4f4e94f6..0d87f376a7 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Field; import java.util.Map; @@ -42,6 +40,8 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.util.ReflectionUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher @@ -67,7 +67,7 @@ public class ChatMessageInboundChannelAdapterParserTests { private ChatMessageListeningEndpoint autoChannelAdapter; @Test - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public void testInboundAdapter() { ChatMessageListeningEndpoint adapter = context.getBean("xmppInboundAdapter", ChatMessageListeningEndpoint.class); MessageChannel errorChannel = (MessageChannel) TestUtils.getPropertyValue(adapter, "errorChannel"); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java index 085c384743..3b7fb098c9 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smackx.jiveproperties.JivePropertiesManager; @@ -46,6 +41,11 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests.java index 42764d9dad..723b298bb9 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceInboundChannelAdapterParserTests.java @@ -16,12 +16,12 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThatNoException; - import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThatNoException; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java index 4d61370b0a..843ce6dea7 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Set; import org.junit.jupiter.api.Test; @@ -36,6 +34,8 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Mark Fisher diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests.java index ce192005b7..deb1e29181 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionFactoryBeanTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.mockito.Mockito.mock; - import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.roster.Roster; import org.jivesoftware.smack.tcp.XMPPTCPConnection; @@ -28,6 +24,10 @@ import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionParserTests.java index 7e158588b6..6e8a0805c8 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppConnectionParserTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.jivesoftware.smack.XMPPConnection; import org.junit.jupiter.api.Test; @@ -25,6 +23,8 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.test.util.TestUtils; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index 970e160272..c290db2bd2 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -16,12 +16,6 @@ package org.springframework.integration.xmpp.config; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -39,6 +33,12 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Mark Fisher * @author Josh Long diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java index 58a9561e00..67caf630a8 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java @@ -16,16 +16,6 @@ package org.springframework.integration.xmpp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.io.IOException; import java.util.HashSet; import java.util.Set; @@ -64,6 +54,16 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java index 985d5c91a6..5c6925e441 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.xmpp.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; - import java.util.Set; import org.jivesoftware.smack.XMPPConnection; @@ -40,6 +36,10 @@ import org.springframework.messaging.MessagingException; import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.ErrorMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java index ebcf2f1055..49433d8bc5 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java @@ -16,16 +16,6 @@ package org.springframework.integration.xmpp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.StanzaBuilder; import org.jivesoftware.smackx.gcm.packet.GcmPacketExtension; @@ -44,6 +34,16 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java index 6788c5a6c1..6a07622fd6 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandlerTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.xmpp.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.Mockito.mock; - import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.StanzaBuilder; import org.junit.jupiter.api.Test; @@ -32,6 +27,11 @@ import org.springframework.integration.xmpp.core.XmppContextUtils; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.support.GenericMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.mockito.Mockito.mock; + /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java index 0f6062badc..28e39f4526 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java @@ -16,8 +16,6 @@ package org.springframework.integration.xmpp.support; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.HashMap; import java.util.Map; @@ -31,6 +29,8 @@ import org.jxmpp.stringprep.XmppStringprepException; import org.springframework.integration.xmpp.XmppHeaders; import org.springframework.messaging.MessageHeaders; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Mark Fisher * @author Florian Schmaus diff --git a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java index 33000180c2..8c94355450 100644 --- a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java +++ b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/channel/ZeroMqChannel.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,11 @@ import java.util.function.Supplier; import org.zeromq.SocketType; import org.zeromq.ZContext; import org.zeromq.ZMQ; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Scheduler; +import reactor.core.scheduler.Schedulers; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.mapping.BytesMessageMapper; @@ -37,12 +42,6 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; - /** * The {@link SubscribableChannel} implementation over ZeroMQ sockets. * It can work in two messaging models: @@ -94,9 +93,11 @@ public class ZeroMqChannel extends AbstractMessageChannel implements Subscribabl private BytesMessageMapper messageMapper = new EmbeddedJsonHeadersMessageMapper(); - private Consumer sendSocketConfigurer = (socket) -> { }; + private Consumer sendSocketConfigurer = (socket) -> { + }; - private Consumer subscribeSocketConfigurer = (socket) -> { }; + private Consumer subscribeSocketConfigurer = (socket) -> { + }; @Nullable private ZeroMqProxy zeroMqProxy; @@ -142,21 +143,21 @@ public class ZeroMqChannel extends AbstractMessageChannel implements Subscribabl private Mono prepareProxyMono() { return Mono.defer(() -> { - if (this.zeroMqProxy != null) { - return Mono.fromCallable(() -> this.zeroMqProxy.getBackendPort()) - .filter((proxyPort) -> proxyPort > 0) - .repeatWhenEmpty(100, (repeat) -> repeat.delayElements(Duration.ofMillis(100))) // NOSONAR - .doOnNext((proxyPort) -> - setConnectUrl("tcp://localhost:" + this.zeroMqProxy.getFrontendPort() + - ':' + this.zeroMqProxy.getBackendPort())) - .doOnError((error) -> - logger.error(error, - () -> "The provided '" + this.zeroMqProxy + "' has not been started")); - } - else { - return Mono.empty(); - } - }) + if (this.zeroMqProxy != null) { + return Mono.fromCallable(() -> this.zeroMqProxy.getBackendPort()) + .filter((proxyPort) -> proxyPort > 0) + .repeatWhenEmpty(100, (repeat) -> repeat.delayElements(Duration.ofMillis(100))) // NOSONAR + .doOnNext((proxyPort) -> + setConnectUrl("tcp://localhost:" + this.zeroMqProxy.getFrontendPort() + + ':' + this.zeroMqProxy.getBackendPort())) + .doOnError((error) -> + logger.error(error, + () -> "The provided '" + this.zeroMqProxy + "' has not been started")); + } + else { + return Mono.empty(); + } + }) .cache(); } diff --git a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducer.java b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducer.java index ae2b9af006..0f0d3c0285 100644 --- a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducer.java +++ b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducer.java @@ -28,6 +28,10 @@ import org.zeromq.SocketType; import org.zeromq.ZContext; import org.zeromq.ZMQ; import org.zeromq.ZMsg; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Scheduler; +import reactor.core.scheduler.Schedulers; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.mapping.ConvertingBytesMessageMapper; @@ -42,11 +46,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.converter.MessageConverter; import org.springframework.util.Assert; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; - /** * A {@link MessageProducerSupport} implementation for consuming messages from ZeroMq socket. * Only {@link SocketType#PAIR}, {@link SocketType#SUB} and {@link SocketType#PULL} are supported. @@ -77,11 +76,12 @@ public class ZeroMqMessageProducer extends MessageProducerSupport { private InboundMessageMapper messageMapper; - private Consumer socketConfigurer = (socket) -> { }; + private Consumer socketConfigurer = (socket) -> { + }; private Duration consumeDelay = DEFAULT_CONSUME_DELAY; - private String[] topics = { "" }; // Equivalent to ZMQ#SUBSCRIPTION_ALL + private String[] topics = {""}; // Equivalent to ZMQ#SUBSCRIPTION_ALL private boolean receiveRaw; diff --git a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java index 61ed165875..ee0e434560 100644 --- a/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java +++ b/spring-integration-zeromq/src/main/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandler.java @@ -27,6 +27,11 @@ import org.zeromq.ZContext; import org.zeromq.ZFrame; import org.zeromq.ZMQ; import org.zeromq.ZMsg; +import reactor.core.Disposable; +import reactor.core.publisher.Mono; +import reactor.core.scheduler.Scheduler; +import reactor.core.scheduler.Schedulers; +import zmq.socket.pubsub.Pub; import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.EvaluationContext; @@ -43,12 +48,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.converter.MessageConverter; import org.springframework.util.Assert; -import reactor.core.Disposable; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.core.scheduler.Schedulers; -import zmq.socket.pubsub.Pub; - /** * The {@link AbstractReactiveMessageHandler} implementation for publishing messages over ZeroMq socket. * Only {@link SocketType#PAIR}, {@link SocketType#PUB} and {@link SocketType#PUSH} are supported. @@ -79,7 +78,8 @@ public class ZeroMqMessageHandler extends AbstractReactiveMessageHandler private OutboundMessageMapper messageMapper; - private Consumer socketConfigurer = (socket) -> { }; + private Consumer socketConfigurer = (socket) -> { + }; private Expression topicExpression = new SupplierExpression<>(() -> null); diff --git a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/channel/ZeroMqChannelTests.java b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/channel/ZeroMqChannelTests.java index e7b97d3e3a..20561ddbdc 100644 --- a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/channel/ZeroMqChannelTests.java +++ b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/channel/ZeroMqChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.zeromq.channel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.Map; import java.util.concurrent.BlockingQueue; @@ -33,6 +30,7 @@ import org.zeromq.ZAuth; import org.zeromq.ZCert; import org.zeromq.ZContext; import org.zeromq.ZMQ; +import reactor.core.publisher.Mono; import org.springframework.integration.support.json.EmbeddedJsonHeadersMessageMapper; import org.springframework.integration.test.util.TestUtils; @@ -40,7 +38,8 @@ import org.springframework.integration.zeromq.ZeroMqProxy; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; /** * @author Artem Bilan @@ -66,7 +65,8 @@ public class ZeroMqChannelTests { AtomicBoolean customMessageMapperCalled = new AtomicBoolean(); channel.setMessageMapper(new EmbeddedJsonHeadersMessageMapper() { - @Override public Message toMessage(byte[] bytes, Map headers) { + @Override + public Message toMessage(byte[] bytes, Map headers) { customMessageMapperCalled.set(true); return super.toMessage(bytes, headers); } diff --git a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/dsl/ZeroMqDslTests.java b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/dsl/ZeroMqDslTests.java index 0e6c51eac7..8478ba75c2 100644 --- a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/dsl/ZeroMqDslTests.java +++ b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/dsl/ZeroMqDslTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.zeromq.dsl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; - import java.time.Duration; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -44,6 +41,9 @@ import org.springframework.messaging.support.GenericMessage; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + /** * @author Artem Bilan * diff --git a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducerTests.java b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducerTests.java index 586b8c7547..c80c99c230 100644 --- a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducerTests.java +++ b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/inbound/ZeroMqMessageProducerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,6 @@ package org.springframework.integration.zeromq.inbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; - import java.time.Duration; import org.assertj.core.api.InstanceOfAssertFactories; @@ -30,14 +26,17 @@ import org.zeromq.ZContext; import org.zeromq.ZFrame; import org.zeromq.ZMQ; import org.zeromq.ZMsg; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.channel.FluxMessageChannel; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; /** * @author Artem Bilan diff --git a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandlerTests.java b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandlerTests.java index e0fdec0f1c..752886b323 100644 --- a/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandlerTests.java +++ b/spring-integration-zeromq/src/test/java/org/springframework/integration/zeromq/outbound/ZeroMqMessageHandlerTests.java @@ -17,10 +17,6 @@ package org.springframework.integration.zeromq.outbound; -import static org.assertj.core.api.Assertions.assertThat; -import static org.awaitility.Awaitility.await; -import static org.mockito.Mockito.mock; - import java.time.Duration; import org.junit.jupiter.api.AfterAll; @@ -29,6 +25,7 @@ import org.zeromq.SocketType; import org.zeromq.ZContext; import org.zeromq.ZMQ; import org.zeromq.ZMsg; +import reactor.core.publisher.Mono; import org.springframework.beans.factory.BeanFactory; import org.springframework.integration.expression.FunctionExpression; @@ -40,7 +37,9 @@ import org.springframework.messaging.Message; import org.springframework.messaging.converter.ByteArrayMessageConverter; import org.springframework.messaging.support.GenericMessage; -import reactor.core.publisher.Mono; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; +import static org.mockito.Mockito.mock; /** * @author Artem Bilan diff --git a/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/config/xml/ZookeeperNamespaceHandler.java b/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/config/xml/ZookeeperNamespaceHandler.java index 9e37525109..0f8a1a2065 100644 --- a/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/config/xml/ZookeeperNamespaceHandler.java +++ b/spring-integration-zookeeper/src/main/java/org/springframework/integration/zookeeper/config/xml/ZookeeperNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ public class ZookeeperNamespaceHandler extends AbstractIntegrationNamespaceHandl @Override public void init() { - this.registerBeanDefinitionParser("leader-listener", new LeaderListenerParser()); + this.registerBeanDefinitionParser("leader-listener", new LeaderListenerParser()); } } diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/CuratorFrameworkFactoryBeanTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/CuratorFrameworkFactoryBeanTests.java index de94c52087..835c9b9294 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/CuratorFrameworkFactoryBeanTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/CuratorFrameworkFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package org.springframework.integration.zookeeper.config; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.curator.test.TestingServer; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/LeaderInitiatorFactoryBeanTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/LeaderInitiatorFactoryBeanTests.java index c69af8505b..fb1e43611d 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/LeaderInitiatorFactoryBeanTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/LeaderInitiatorFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.zookeeper.config; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -44,6 +42,8 @@ import org.springframework.integration.zookeeper.leader.LeaderInitiator; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/xml/ZookeeperParserTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/xml/ZookeeperParserTests.java index b48138c292..f3c7493264 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/xml/ZookeeperParserTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/config/xml/ZookeeperParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ package org.springframework.integration.zookeeper.config.xml; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.curator.framework.CuratorFramework; import org.junit.jupiter.api.Test; @@ -30,6 +28,8 @@ import org.springframework.integration.zookeeper.leader.LeaderInitiator; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java index b2e5d7fa71..d6bc6d8e9c 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/event/ZookeeperLeaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2020 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.zookeeper.event; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; - import java.util.Collections; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; @@ -45,6 +42,9 @@ import org.springframework.integration.zookeeper.leader.LeaderInitiator; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.Trigger; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java index b2415a6c7a..9baa918890 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/lock/ZkLockRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2021 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,6 @@ package org.springframework.integration.zookeeper.lock; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.Map; import java.util.Queue; import java.util.concurrent.CountDownLatch; @@ -36,6 +33,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.zookeeper.ZookeeperTestSupport; import org.springframework.messaging.MessagingException; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * @author Gary Russell * @author Artem Bilan diff --git a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/metadata/ZookeeperMetadataStoreTests.java b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/metadata/ZookeeperMetadataStoreTests.java index e67ffd9e82..9e3687c835 100644 --- a/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/metadata/ZookeeperMetadataStoreTests.java +++ b/spring-integration-zookeeper/src/test/java/org/springframework/integration/zookeeper/metadata/ZookeeperMetadataStoreTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.zookeeper.metadata; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; -import static org.awaitility.Awaitility.await; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -42,6 +37,11 @@ import org.springframework.integration.metadata.MetadataStoreListenerAdapter; import org.springframework.integration.support.utils.IntegrationUtils; import org.springframework.integration.zookeeper.ZookeeperTestSupport; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; +import static org.awaitility.Awaitility.await; + /** * @author Marius Bogoevici * @author Artem Bilan diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 2bc77f9e69..f557a20d5e 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -103,10 +103,10 @@ - + - + diff --git a/src/eclipse/org.eclipse.core.resources.prefs b/src/eclipse/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/src/eclipse/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/src/eclipse/org.eclipse.jdt.core.prefs b/src/eclipse/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..3b3666c96c --- /dev/null +++ b/src/eclipse/org.eclipse.jdt.core.prefs @@ -0,0 +1,469 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +org.eclipse.jdt.core.codeComplete.argumentPrefixes= +org.eclipse.jdt.core.codeComplete.argumentSuffixes= +org.eclipse.jdt.core.codeComplete.fieldPrefixes= +org.eclipse.jdt.core.codeComplete.fieldSuffixes= +org.eclipse.jdt.core.codeComplete.localPrefixes= +org.eclipse.jdt.core.codeComplete.localSuffixes= +org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=info +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=ignore +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=false +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=false +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=90 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=tab +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/src/eclipse/org.eclipse.jdt.ui.prefs b/src/eclipse/org.eclipse.jdt.ui.prefs new file mode 100644 index 0000000000..1961fa9533 --- /dev/null +++ b/src/eclipse/org.eclipse.jdt.ui.prefs @@ -0,0 +1,66 @@ +cleanup.add_default_serial_version_id=true +cleanup.add_generated_serial_version_id=false +cleanup.add_missing_annotations=false +cleanup.add_missing_deprecated_annotations=true +cleanup.add_missing_methods=false +cleanup.add_missing_nls_tags=false +cleanup.add_missing_override_annotations=true +cleanup.add_missing_override_annotations_interface_methods=true +cleanup.add_serial_version_id=false +cleanup.always_use_blocks=true +cleanup.always_use_parentheses_in_expressions=false +cleanup.always_use_this_for_non_static_field_access=true +cleanup.always_use_this_for_non_static_method_access=false +cleanup.convert_to_enhanced_for_loop=false +cleanup.correct_indentation=false +cleanup.format_source_code=false +cleanup.format_source_code_changes_only=false +cleanup.make_local_variable_final=false +cleanup.make_parameters_final=false +cleanup.make_private_fields_final=true +cleanup.make_type_abstract_if_missing_method=false +cleanup.make_variable_declarations_final=true +cleanup.never_use_blocks=false +cleanup.never_use_parentheses_in_expressions=true +cleanup.organize_imports=false +cleanup.qualify_static_field_accesses_with_declaring_class=false +cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +cleanup.qualify_static_member_accesses_with_declaring_class=true +cleanup.qualify_static_method_accesses_with_declaring_class=false +cleanup.remove_private_constructors=true +cleanup.remove_trailing_whitespaces=true +cleanup.remove_trailing_whitespaces_all=true +cleanup.remove_trailing_whitespaces_ignore_empty=false +cleanup.remove_unnecessary_casts=true +cleanup.remove_unnecessary_nls_tags=true +cleanup.remove_unused_imports=true +cleanup.remove_unused_local_variables=false +cleanup.remove_unused_private_fields=true +cleanup.remove_unused_private_members=false +cleanup.remove_unused_private_methods=true +cleanup.remove_unused_private_types=true +cleanup.sort_members=false +cleanup.sort_members_all=false +cleanup.use_blocks=true +cleanup.use_blocks_only_for_return_and_throw=false +cleanup.use_parentheses_in_expressions=false +cleanup.use_this_for_non_static_field_access=true +cleanup.use_this_for_non_static_field_access_only_if_necessary=false +cleanup.use_this_for_non_static_method_access=false +cleanup.use_this_for_non_static_method_access_only_if_necessary=true +cleanup_profile=_Spring +cleanup_settings_version=2 +eclipse.preferences.version=1 +formatter_profile=_spring +formatter_settings_version=13 +org.eclipse.jdt.ui.exception.name=e +org.eclipse.jdt.ui.gettersetter.use.is=true +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;;org.springframework;\#; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.keywordthis=false +org.eclipse.jdt.ui.ondemandthreshold=9999 +org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.staticondemandthreshold=9999 +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/src/idea/spring-framework.xml b/src/idea/spring-framework.xml new file mode 100644 index 0000000000..c2dddb7c7c --- /dev/null +++ b/src/idea/spring-framework.xml @@ -0,0 +1,263 @@ + + + + + \ No newline at end of file