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

Author: artembilan

.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"
+                  }
                 }
               ]
             }

.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

.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
-
-    # 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
-
-    # 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 }}
-
-    # Print staging repo id
-    - name: Print Staging Repo Id
-      run: echo ${{ steps.nexus.outputs.staged-repository-id }}
+      # 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 }}
+
+      # 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"
+
+      # 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 }}

.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

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 @@
 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"
 	};
 
 

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 @@
  * @since 5.0
  */
 public abstract class
-	AmqpBaseOutboundEndpointSpec<S extends AmqpBaseOutboundEndpointSpec<S, E>, E extends AbstractAmqpOutboundEndpoint>
+AmqpBaseOutboundEndpointSpec<S extends AmqpBaseOutboundEndpointSpec<S, E>, E extends AbstractAmqpOutboundEndpoint>
 		extends MessageHandlerSpec<S, E> {
 
 	protected final DefaultAmqpHeaderMapper headerMapper = DefaultAmqpHeaderMapper.outboundMapper(); // NOSONAR final

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

@@ -36,7 +36,7 @@
  * @since 5.0
  */
 public abstract class AmqpInboundChannelAdapterSpec
-			<S extends AmqpInboundChannelAdapterSpec<S, C>, C extends MessageListenerContainer>
+		<S extends AmqpInboundChannelAdapterSpec<S, C>, C extends MessageListenerContainer>
 		extends AmqpBaseInboundChannelAdapterSpec<S>
 		implements ComponentsRegistration {
 

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 @@
  * @since 5.0
  */
 public abstract class AmqpInboundGatewaySpec
-				<S extends AmqpInboundGatewaySpec<S, C>, C extends AbstractMessageListenerContainer>
+		<S extends AmqpInboundGatewaySpec<S, C>, C extends AbstractMessageListenerContainer>
 		extends AmqpBaseInboundGatewaySpec<S>
 		implements ComponentsRegistration {
 

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.
  *

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

@@ -18,12 +18,12 @@
 
 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}.
  *

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

@@ -18,16 +18,15 @@
 
 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;
 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}.
  *

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.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.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 @@ protected class Listener implements ChannelAwareMessageListener {
 				AmqpInboundChannelAdapter.this.abstractListenerContainer == null
 						? false
 						: AcknowledgeMode.MANUAL == AmqpInboundChannelAdapter.this.abstractListenerContainer
-								.getAcknowledgeMode();
+						.getAcknowledgeMode();
 
 		protected final RetryOperations retryOps = AmqpInboundChannelAdapter.this.retryTemplate; // NOSONAR
 

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.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.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 AmqpInboundGateway(AbstractMessageListenerContainer listenerContainer) {
 	}
 
 	// 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 @@ private void setupRecoveryCallbackIfAny() {
 		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;
+					};
 		}
 	}