Skip to content

Commit 7864658

Browse files
artembilanartembilan
committed
GH-3686: Apply SF editor config
Fixes #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
1 parent bca9d27 commit 7864658

File tree

1,385 files changed

+7705
-7009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,385 files changed

+7705
-7009
lines changed

‎.github/release-files-spec.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
{
88
"@build.name": "${buildname}",
99
"@build.number": "${buildnumber}",
10-
"path": {"$match": "org*"}
10+
"path": {
11+
"$match": "org*"
12+
}
1113
},
1214
{
1315
"$or": [
1416
{
15-
"name": {"$match": "*.pom"}
17+
"name": {
18+
"$match": "*.pom"
19+
}
1620
},
1721
{
18-
"name": {"$match": "*.jar"}
22+
"name": {
23+
"$match": "*.jar"
24+
}
1925
}
2026
]
2127
}

‎.github/workflows/central-sync-close.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414

15-
# Request close promotion repo
16-
- uses: jvalkeal/nexus-sync@v0
17-
with:
18-
url: ${{ secrets.OSSRH_URL }}
19-
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
20-
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
21-
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
22-
staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }}
23-
close: true
15+
# Request close promotion repo
16+
- uses: jvalkeal/nexus-sync@v0
17+
with:
18+
url: ${{ secrets.OSSRH_URL }}
19+
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
20+
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
21+
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
22+
staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }}
23+
close: true

‎.github/workflows/central-sync-create.yml

+41-41
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,44 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717

18-
# to get spec file in .github
19-
- uses: actions/checkout@v2
20-
21-
# Setup jfrog cli
22-
- uses: jfrog/setup-jfrog-cli@v1
23-
with:
24-
version: 1.46.4
25-
env:
26-
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
27-
28-
# Extract build id from input
29-
- name: Extract Build Id
30-
run: |
31-
echo JFROG_CLI_BUILD_NAME="${{ github.event.inputs.buildName }}" >> $GITHUB_ENV
32-
echo JFROG_CLI_BUILD_NUMBER=${{ github.event.inputs.buildNumber }} >> $GITHUB_ENV
33-
34-
# Download released files
35-
- name: Download Release Files
36-
run: |
37-
jfrog rt download \
38-
--spec .github/release-files-spec.json \
39-
--spec-vars "buildname=$JFROG_CLI_BUILD_NAME;buildnumber=$JFROG_CLI_BUILD_NUMBER"
40-
41-
# Create checksums, signatures and create staging repo on central and upload
42-
- uses: jvalkeal/nexus-sync@v0
43-
id: nexus
44-
with:
45-
url: ${{ secrets.OSSRH_URL }}
46-
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
47-
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
48-
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
49-
create: true
50-
upload: true
51-
generate-checksums: true
52-
pgp-sign: true
53-
pgp-sign-passphrase: ${{ secrets.GPG_PASSPHRASE }}
54-
pgp-sign-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
55-
56-
# Print staging repo id
57-
- name: Print Staging Repo Id
58-
run: echo ${{ steps.nexus.outputs.staged-repository-id }}
18+
# to get spec file in .github
19+
- uses: actions/checkout@v2
20+
21+
# Setup jfrog cli
22+
- uses: jfrog/setup-jfrog-cli@v1
23+
with:
24+
version: 1.46.4
25+
env:
26+
JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
27+
28+
# Extract build id from input
29+
- name: Extract Build Id
30+
run: |
31+
echo JFROG_CLI_BUILD_NAME="${{ github.event.inputs.buildName }}" >> $GITHUB_ENV
32+
echo JFROG_CLI_BUILD_NUMBER=${{ github.event.inputs.buildNumber }} >> $GITHUB_ENV
33+
34+
# Download released files
35+
- name: Download Release Files
36+
run: |
37+
jfrog rt download \
38+
--spec .github/release-files-spec.json \
39+
--spec-vars "buildname=$JFROG_CLI_BUILD_NAME;buildnumber=$JFROG_CLI_BUILD_NUMBER"
40+
41+
# Create checksums, signatures and create staging repo on central and upload
42+
- uses: jvalkeal/nexus-sync@v0
43+
id: nexus
44+
with:
45+
url: ${{ secrets.OSSRH_URL }}
46+
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
47+
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
48+
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
49+
create: true
50+
upload: true
51+
generate-checksums: true
52+
pgp-sign: true
53+
pgp-sign-passphrase: ${{ secrets.GPG_PASSPHRASE }}
54+
pgp-sign-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
55+
56+
# Print staging repo id
57+
- name: Print Staging Repo Id
58+
run: echo ${{ steps.nexus.outputs.staged-repository-id }}

‎.github/workflows/central-sync-release.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414

15-
# Request release promotion repo
16-
- uses: jvalkeal/nexus-sync@v0
17-
with:
18-
url: ${{ secrets.OSSRH_URL }}
19-
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
20-
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
21-
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
22-
staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }}
23-
release: true
15+
# Request release promotion repo
16+
- uses: jvalkeal/nexus-sync@v0
17+
with:
18+
url: ${{ secrets.OSSRH_URL }}
19+
username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
20+
password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
21+
staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
22+
staging-repo-id: ${{ github.event.inputs.stagedRepositoryId }}
23+
release: true

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,29 +47,29 @@
4747
abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefinitionParser {
4848

4949
private static final String[] CONTAINER_VALUE_ATTRIBUTES = {
50-
"acknowledge-mode",
51-
"channel-transacted",
52-
"concurrent-consumers",
53-
"consumers-per-queue",
54-
"expose-listener-channel",
55-
"phase",
56-
"prefetch-count",
57-
"queue-names",
58-
"recovery-interval",
59-
"receive-timeout",
60-
"shutdown-timeout",
61-
"tx-size",
62-
"missing-queues-fatal"
50+
"acknowledge-mode",
51+
"channel-transacted",
52+
"concurrent-consumers",
53+
"consumers-per-queue",
54+
"expose-listener-channel",
55+
"phase",
56+
"prefetch-count",
57+
"queue-names",
58+
"recovery-interval",
59+
"receive-timeout",
60+
"shutdown-timeout",
61+
"tx-size",
62+
"missing-queues-fatal"
6363
};
6464

6565
private static final String[] CONTAINER_REFERENCE_ATTRIBUTES = {
66-
"advice-chain",
67-
"connection-factory",
68-
"error-handler",
69-
"message-properties-converter",
70-
"task-executor",
71-
"transaction-attribute",
72-
"transaction-manager"
66+
"advice-chain",
67+
"connection-factory",
68+
"error-handler",
69+
"message-properties-converter",
70+
"task-executor",
71+
"transaction-attribute",
72+
"transaction-manager"
7373
};
7474

7575

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpBaseOutboundEndpointSpec.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 the original author or authors.
2+
* Copyright 2016-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
4141
* @since 5.0
4242
*/
4343
public abstract class
44-
AmqpBaseOutboundEndpointSpec<S extends AmqpBaseOutboundEndpointSpec<S, E>, E extends AbstractAmqpOutboundEndpoint>
44+
AmqpBaseOutboundEndpointSpec<S extends AmqpBaseOutboundEndpointSpec<S, E>, E extends AbstractAmqpOutboundEndpoint>
4545
extends MessageHandlerSpec<S, E> {
4646

4747
protected final DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.outboundMapper(); // NOSONAR final

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundChannelAdapterSpec.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* @since 5.0
3737
*/
3838
public abstract class AmqpInboundChannelAdapterSpec
39-
<S extends AmqpInboundChannelAdapterSpec<S, C>, C extends MessageListenerContainer>
39+
<S extends AmqpInboundChannelAdapterSpec<S, C>, C extends MessageListenerContainer>
4040
extends AmqpBaseInboundChannelAdapterSpec<S>
4141
implements ComponentsRegistration {
4242

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/AmqpInboundGatewaySpec.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2020 the original author or authors.
2+
* Copyright 2014-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
3636
* @since 5.0
3737
*/
3838
public abstract class AmqpInboundGatewaySpec
39-
<S extends AmqpInboundGatewaySpec<S, C>, C extends AbstractMessageListenerContainer>
39+
<S extends AmqpInboundGatewaySpec<S, C>, C extends AbstractMessageListenerContainer>
4040
extends AmqpBaseInboundGatewaySpec<S>
4141
implements ComponentsRegistration {
4242

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStream.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
package org.springframework.integration.amqp.dsl;
1818

19-
import org.springframework.rabbit.stream.listener.StreamListenerContainer;
20-
import org.springframework.rabbit.stream.producer.RabbitStreamTemplate;
21-
2219
import com.rabbitmq.stream.Codec;
2320
import com.rabbitmq.stream.Environment;
2421

22+
import org.springframework.rabbit.stream.listener.StreamListenerContainer;
23+
import org.springframework.rabbit.stream.producer.RabbitStreamTemplate;
24+
2525
/**
2626
* Factory class for RabbitMQ components.
2727
*

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamInboundChannelAdapterSpec.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import java.util.function.Consumer;
2020

21-
import org.springframework.lang.Nullable;
22-
import org.springframework.rabbit.stream.listener.StreamListenerContainer;
23-
2421
import com.rabbitmq.stream.Codec;
2522
import com.rabbitmq.stream.Environment;
2623

24+
import org.springframework.lang.Nullable;
25+
import org.springframework.rabbit.stream.listener.StreamListenerContainer;
26+
2727
/**
2828
* Spec for an inbound channel adapter with a {@link StreamListenerContainer}.
2929
*

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/dsl/RabbitStreamMessageListenerContainerSpec.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818

1919
import java.util.function.Consumer;
2020

21+
import com.rabbitmq.stream.Codec;
22+
import com.rabbitmq.stream.Environment;
2123
import org.aopalliance.aop.Advice;
2224

2325
import org.springframework.lang.Nullable;
2426
import org.springframework.rabbit.stream.listener.ConsumerCustomizer;
2527
import org.springframework.rabbit.stream.listener.StreamListenerContainer;
2628
import org.springframework.rabbit.stream.support.converter.StreamMessageConverter;
2729

28-
import com.rabbitmq.stream.Codec;
29-
import com.rabbitmq.stream.Environment;
30-
3130
/**
3231
* Spec for {@link StreamListenerContainer}.
3332
*

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@
2222
import java.util.Map;
2323
import java.util.concurrent.atomic.AtomicInteger;
2424

25+
import com.rabbitmq.client.Channel;
26+
2527
import org.springframework.amqp.core.AcknowledgeMode;
2628
import org.springframework.amqp.core.Message;
2729
import org.springframework.amqp.rabbit.batch.BatchingStrategy;
@@ -54,8 +56,6 @@
5456
import org.springframework.retry.support.RetryTemplate;
5557
import org.springframework.util.Assert;
5658

57-
import com.rabbitmq.client.Channel;
58-
5959
/**
6060
* Adapter that receives Messages from an AMQP Queue, converts them into
6161
* Spring Integration Messages, and sends the results to a Message Channel.
@@ -349,7 +349,7 @@ protected class Listener implements ChannelAwareMessageListener {
349349
AmqpInboundChannelAdapter.this.abstractListenerContainer == null
350350
? false
351351
: AcknowledgeMode.MANUAL == AmqpInboundChannelAdapter.this.abstractListenerContainer
352-
.getAcknowledgeMode();
352+
.getAcknowledgeMode();
353353

354354
protected final RetryOperations retryOps = AmqpInboundChannelAdapter.this.retryTemplate; // NOSONAR
355355

‎spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
2121
import java.util.Map;
2222
import java.util.concurrent.atomic.AtomicInteger;
2323

24+
import com.rabbitmq.client.Channel;
25+
2426
import org.springframework.amqp.core.AcknowledgeMode;
2527
import org.springframework.amqp.core.Address;
2628
import org.springframework.amqp.core.AmqpTemplate;
@@ -51,8 +53,6 @@
5153
import org.springframework.retry.support.RetryTemplate;
5254
import org.springframework.util.Assert;
5355

54-
import com.rabbitmq.client.Channel;
55-
5656
/**
5757
* Adapter that receives Messages from an AMQP Queue, converts them into
5858
* Spring Integration Messages, and sends the results to a Message Channel.
@@ -102,6 +102,7 @@ public AmqpInboundGateway(AbstractMessageListenerContainer listenerContainer) {
102102
}
103103

104104
// TODO Remove in 6.0
105+
105106
/**
106107
* Construct {@link AmqpInboundGateway} based on the provided {@link AbstractMessageListenerContainer}
107108
* to receive request messages and {@link AmqpTemplate} to send replies.
@@ -290,14 +291,14 @@ private void setupRecoveryCallbackIfAny() {
290291
Assert.state(this.recoveryCallback == null || this.messageRecoverer == null,
291292
"Only one of 'recoveryCallback' or 'messageRecoverer' may be provided, but not both");
292293
if (this.messageRecoverer != null) {
293-
this.recoveryCallback =
294-
context -> {
295-
Message messageToRecover =
296-
(Message) RetrySynchronizationManager.getContext()
297-
.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE);
298-
this.messageRecoverer.recover(messageToRecover, context.getLastThrowable());
299-
return null;
300-
};
294+
this.recoveryCallback =
295+
context -> {
296+
Message messageToRecover =
297+
(Message) RetrySynchronizationManager.getContext()
298+
.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE);
299+
this.messageRecoverer.recover(messageToRecover, context.getLastThrowable());
300+
return null;
301+
};
301302
}
302303
}
303304

0 commit comments

Comments
 (0)