From 2d1e2f9d4db06646c1e83e4105204eae4d186258 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 24 Aug 2022 16:39:08 +0200 Subject: [PATCH] Migrated to new autoconfiguration import boot approach (#1811) --- .../src/test/resources/META-INF/spring.factories | 3 --- ....boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 12 ------------ ...runner.spring.AutoConfigureStubRunner.imports | 10 ++++++++++ ...ng.boot.AutoConfigureMessageVerifier.imports} | 16 +++++++--------- 5 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring.factories create mode 100644 docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring/org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner.imports rename spring-cloud-contract-verifier/src/main/resources/META-INF/{spring.factories => spring/org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier.imports} (59%) diff --git a/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring.factories b/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring.factories deleted file mode 100644 index 6e51754b49..0000000000 --- a/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configuration -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -contracts.MessagingAutoConfig \ No newline at end of file diff --git a/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000..45330bbdc5 --- /dev/null +++ b/docker/spring-cloud-contract-docker/project/src/test/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +contracts.MessagingAutoConfig diff --git a/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring.factories index c72d5a579c..ee0ca0f753 100644 --- a/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring.factories @@ -1,15 +1,3 @@ -# Auto Configuration -org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner=\ -org.springframework.cloud.contract.stubrunner.spring.StubRunnerConfiguration,\ -org.springframework.cloud.contract.stubrunner.spring.cloud.StubRunnerSpringCloudAutoConfiguration,\ -org.springframework.cloud.contract.stubrunner.spring.cloud.loadbalancer.SpringCloudLoadBalancerAutoConfiguration,\ -org.springframework.cloud.contract.stubrunner.messaging.integration.StubRunnerIntegrationConfiguration,\ -org.springframework.cloud.contract.stubrunner.messaging.jms.StubRunnerJmsConfiguration,\ -org.springframework.cloud.contract.stubrunner.messaging.stream.StubRunnerStreamConfiguration,\ -org.springframework.cloud.contract.stubrunner.spring.cloud.zookeeper.StubRunnerSpringCloudZookeeperAutoConfiguration,\ -org.springframework.cloud.contract.stubrunner.spring.cloud.consul.StubRunnerSpringCloudConsulAutoConfiguration,\ -org.springframework.cloud.contract.stubrunner.messaging.StubRunnerStreamsIntegrationAutoConfiguration,\ -org.springframework.cloud.contract.stubrunner.messaging.camel.StubRunnerCamelConfiguration # Test Execution Listeners org.springframework.test.context.TestExecutionListener=\ org.springframework.cloud.contract.stubrunner.provider.wiremock.StubRunnerWireMockTestExecutionListener diff --git a/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring/org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner.imports b/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring/org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner.imports new file mode 100644 index 0000000000..59fd232984 --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/main/resources/META-INF/spring/org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner.imports @@ -0,0 +1,10 @@ +org.springframework.cloud.contract.stubrunner.spring.StubRunnerConfiguration +org.springframework.cloud.contract.stubrunner.spring.cloud.StubRunnerSpringCloudAutoConfiguration +org.springframework.cloud.contract.stubrunner.spring.cloud.loadbalancer.SpringCloudLoadBalancerAutoConfiguration +org.springframework.cloud.contract.stubrunner.messaging.integration.StubRunnerIntegrationConfiguration +org.springframework.cloud.contract.stubrunner.messaging.jms.StubRunnerJmsConfiguration +org.springframework.cloud.contract.stubrunner.messaging.stream.StubRunnerStreamConfiguration +org.springframework.cloud.contract.stubrunner.spring.cloud.zookeeper.StubRunnerSpringCloudZookeeperAutoConfiguration +org.springframework.cloud.contract.stubrunner.spring.cloud.consul.StubRunnerSpringCloudConsulAutoConfiguration +org.springframework.cloud.contract.stubrunner.messaging.StubRunnerStreamsIntegrationAutoConfiguration +org.springframework.cloud.contract.stubrunner.messaging.camel.StubRunnerCamelConfiguration diff --git a/spring-cloud-contract-verifier/src/main/resources/META-INF/spring.factories b/spring-cloud-contract-verifier/src/main/resources/META-INF/spring/org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier.imports similarity index 59% rename from spring-cloud-contract-verifier/src/main/resources/META-INF/spring.factories rename to spring-cloud-contract-verifier/src/main/resources/META-INF/spring/org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier.imports index 478246fbde..750a6c52ef 100644 --- a/spring-cloud-contract-verifier/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-contract-verifier/src/main/resources/META-INF/spring/org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier.imports @@ -1,10 +1,8 @@ -# Auto Configuration -org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier=\ -org.springframework.cloud.contract.verifier.messaging.stream.ContractVerifierStreamAutoConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.integration.ContractVerifierIntegrationConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.amqp.ContractVerifierAmqpAutoConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.amqp.RabbitMockConnectionFactoryAutoConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.camel.ContractVerifierCamelConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.jms.ContractVerifierJmsConfiguration,\ -org.springframework.cloud.contract.verifier.messaging.kafka.ContractVerifierKafkaConfiguration,\ +org.springframework.cloud.contract.verifier.messaging.stream.ContractVerifierStreamAutoConfiguration +org.springframework.cloud.contract.verifier.messaging.integration.ContractVerifierIntegrationConfiguration +org.springframework.cloud.contract.verifier.messaging.amqp.ContractVerifierAmqpAutoConfiguration +org.springframework.cloud.contract.verifier.messaging.amqp.RabbitMockConnectionFactoryAutoConfiguration +org.springframework.cloud.contract.verifier.messaging.camel.ContractVerifierCamelConfiguration +org.springframework.cloud.contract.verifier.messaging.jms.ContractVerifierJmsConfiguration +org.springframework.cloud.contract.verifier.messaging.kafka.ContractVerifierKafkaConfiguration org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierAutoConfiguration