Skip to content

Commit d22207d

Browse files
dartartemdartartem
committedMay 27, 2021
Used eventuate BOM. Optimized swagger configuration.
1 parent 38bd5c3 commit d22207d

File tree

36 files changed

+105
-134
lines changed

36 files changed

+105
-134
lines changed
 

‎build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
88
classpath "io.spring.gradle:dependency-management-plugin:$springDependencyManagementPluginVersion"
99
classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion"
10-
classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:$springCloudContractDependenciesVersion" }
11-
10+
classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:$springCloudContractDependenciesVersion"
11+
}
1212
}
1313

1414
plugins {
@@ -45,6 +45,9 @@ subprojects {
4545

4646
}
4747

48+
dependencies {
49+
implementation(platform("io.eventuate.platform:eventuate-platform-dependencies:$eventuatePlatformVersion"))
50+
}
4851
}
4952

5053
task buildContracts(type: GradleBuild) {
@@ -60,5 +63,4 @@ dockerCompose {
6063
removeOrphans = true
6164
if (project.hasProperty('startedServices'))
6265
startedServices= project.ext.startedServices.split(',')
63-
6466
}

‎buildSrc/src/main/groovy/FtgoServicePlugin.groovy

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class FtgoServicePlugin implements Plugin<Project> {
1414
imports {
1515
mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.ext.springCloudContractDependenciesVersion}"
1616
mavenBom "org.springframework.cloud:spring-cloud-sleuth:${project.ext.springCloudSleuthVersion}"
17+
mavenBom "io.eventuate.platform:eventuate-platform-dependencies:${project.ext.eventuatePlatformVersion}"
1718
}
1819
}
1920

@@ -27,7 +28,9 @@ class FtgoServicePlugin implements Plugin<Project> {
2728
compile 'org.springframework.cloud:spring-cloud-starter-zipkin'
2829
compile "io.zipkin.brave:brave-bom:4.17.1"
2930

30-
compile "io.eventuate.tram.core:eventuate-tram-spring-cloud-sleuth-integration:${project.ext.eventuateTramVersion}"
31+
compile "io.eventuate.tram.core:eventuate-tram-spring-cloud-sleuth-integration"
32+
33+
implementation(platform("io.eventuate.platform:eventuate-platform-dependencies:${project.ext.eventuatePlatformVersion}"))
3134
}
3235

3336
}

‎ftgo-accounting-service-api/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22

3-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant:$eventuateTramSagasVersion"
3+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant"
44
compile project(":ftgo-common")
55

66
}

‎ftgo-accounting-service/build.gradle

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
21
apply plugin: FtgoServicePlugin
32

43

54
dependencies {
65

76
compile project(":ftgo-accounting-service-api")
87
compile project(":common-swagger")
9-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-event-sourcing-support:$eventuateTramSagasVersion"
8+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-event-sourcing-support"
109

11-
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka:$eventuateTramVersion"
12-
compile "io.eventuate.tram.core:eventuate-tram-spring-events:$eventuateTramVersion"
13-
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging:$eventuateTramVersion"
14-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl:$eventuateTramSagasVersion"
10+
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka"
11+
compile "io.eventuate.tram.core:eventuate-tram-spring-events"
12+
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging"
13+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl"
1514

1615
compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
1716
compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
1817
compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
1918
compile 'javax.el:javax.el-api:2.2.5'
2019

2120

22-
compile "io.eventuate.local.java:eventuate-client-java-spring:$eventuateLocalVersion"
23-
compile "io.eventuate.local.java:eventuate-client-java-spring-jdbc:$eventuateLocalVersion"
24-
compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc:${eventuateLocalVersion}"
21+
compile "io.eventuate.local.java:eventuate-client-java-spring"
22+
compile "io.eventuate.local.java:eventuate-client-java-spring-jdbc"
23+
compile "io.eventuate.local.java:eventuate-local-java-spring-jdbc"
2524

2625
compile('org.apache.kafka:kafka-clients:2.3.0') {
2726
force = true
2827
}
2928

30-
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory:$eventuateTramVersion"
29+
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory"
3130
testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
32-
testCompile "io.eventuate.tram.core:eventuate-tram-test-util:$eventuateTramVersion"
31+
testCompile "io.eventuate.tram.core:eventuate-tram-test-util"
3332

34-
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory:$eventuateTramSagasVersion"
33+
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory"
3534
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
3635
testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
3736
testCompile "com.jayway.jsonpath:json-path:2.3.0"

‎ftgo-accounting-service/src/test/java/net/chrisrichardson/ftgo/accountingservice/messaging/AccountingServiceCommandHandlerTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.eventuate.tram.sagas.spring.inmemory.TramSagaInMemoryConfiguration;
1111
import io.eventuate.tram.testutil.TestMessageConsumer;
1212
import io.eventuate.tram.testutil.TestMessageConsumerFactory;
13-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
1413
import io.eventuate.util.test.async.Eventually;
1514
import net.chrisrichardson.ftgo.accountingservice.domain.Account;
1615
import net.chrisrichardson.ftgo.accountingservice.domain.AccountCommand;
@@ -37,7 +36,7 @@
3736
public class AccountingServiceCommandHandlerTest {
3837

3938
@Configuration
40-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
39+
@EnableAutoConfiguration
4140
@Import({AccountingMessagingConfiguration.class,
4241
TramCommandProducerConfiguration.class,
4342
EmbeddedTestAggregateStoreConfiguration.class,

‎ftgo-consumer-service-api/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies {
22

3-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant:$eventuateTramSagasVersion"
3+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant"
44
compile project(":ftgo-common")
55

66
}

‎ftgo-consumer-service/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ configurations.all {
99

1010
dependencies {
1111

12-
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka:$eventuateTramVersion"
13-
compile "io.eventuate.tram.core:eventuate-tram-spring-events:$eventuateTramVersion"
14-
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging:$eventuateTramVersion"
15-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl:$eventuateTramSagasVersion"
12+
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka"
13+
compile "io.eventuate.tram.core:eventuate-tram-spring-events"
14+
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging"
15+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl"
1616

1717
compile project(":common-swagger")
1818
compile project(":ftgo-consumer-service-api")
@@ -29,10 +29,10 @@ dependencies {
2929
}
3030

3131
testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
32-
testCompile "io.eventuate.tram.core:eventuate-tram-test-util:$eventuateTramVersion"
32+
testCompile "io.eventuate.tram.core:eventuate-tram-test-util"
3333

34-
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory:$eventuateTramVersion"
35-
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory:$eventuateTramSagasVersion"
34+
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory"
35+
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory"
3636
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
3737
testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
3838
testCompile "com.jayway.jsonpath:json-path:2.3.0"

‎ftgo-consumer-service/src/test/java/net/chrisrichardson/ftgo/consumerservice/ConsumerServiceInMemoryIntegrationTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.eventuate.tram.spring.inmemory.TramInMemoryConfiguration;
77
import io.eventuate.tram.testutil.TestMessageConsumer;
88
import io.eventuate.tram.testutil.TestMessageConsumerFactory;
9-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
109
import net.chrisrichardson.ftgo.common.Money;
1110
import net.chrisrichardson.ftgo.common.PersonName;
1211
import net.chrisrichardson.ftgo.consumerservice.api.ValidateOrderByConsumer;
@@ -44,7 +43,7 @@ public class ConsumerServiceInMemoryIntegrationTest {
4443
@Import({ConsumerWebConfiguration.class,
4544
TramCommandProducerConfiguration.class,
4645
TramInMemoryConfiguration.class})
47-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
46+
@EnableAutoConfiguration
4847
public static class TestConfiguration {
4948

5049
@Bean

‎ftgo-delivery-service/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ dependencies {
2020
compile project(":ftgo-common-jpa")
2121
compile project(":common-swagger")
2222

23-
compile "io.eventuate.tram.core:eventuate-tram-spring-events:$eventuateTramVersion"
24-
compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
25-
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka:$eventuateTramVersion"
23+
compile "io.eventuate.tram.core:eventuate-tram-spring-events"
24+
compile "org.springframework.boot:spring-boot-starter-data-jpa"
25+
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka"
2626

2727
compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
2828
compile "io.micrometer:micrometer-registry-prometheus:$micrometerVersion"
@@ -32,7 +32,7 @@ dependencies {
3232
}
3333

3434
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
35-
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory:$eventuateTramVersion"
35+
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory"
3636
testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
3737

3838
componentTestCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"

‎ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceInProcessComponentTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import io.eventuate.tram.events.publisher.DomainEventPublisher;
55
import io.eventuate.tram.spring.events.publisher.TramEventsPublisherConfiguration;
66
import io.eventuate.tram.spring.inmemory.TramInMemoryConfiguration;
7-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
87
import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryRepository;
98
import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
109
import net.chrisrichardson.ftgo.deliveryservice.domain.RestaurantRepository;
@@ -39,7 +38,7 @@ public class DeliveryServiceInProcessComponentTest {
3938
private long orderId;
4039

4140
@Configuration
42-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
41+
@EnableAutoConfiguration
4342
@Import({DeliveryServiceMessagingConfiguration.class,
4443
DeliveryServiceWebConfiguration.class,
4544
TramInMemoryConfiguration.class,

‎ftgo-delivery-service/src/component-test/java/net/chrisrichardson/ftgo/deliveryservice/DeliveryServiceOutOfProcessComponentTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import io.eventuate.tram.events.publisher.DomainEventPublisher;
44
import io.eventuate.tram.spring.events.publisher.TramEventsPublisherConfiguration;
55
import io.eventuate.tram.spring.jdbckafka.TramJdbcKafkaConfiguration;
6-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
76
import net.chrisrichardson.ftgo.deliveryservice.domain.DeliveryServiceTestData;
87
import net.chrisrichardson.ftgo.orderservice.api.OrderServiceChannels;
98
import net.chrisrichardson.ftgo.orderservice.api.events.OrderCreatedEvent;
@@ -34,7 +33,7 @@ public class DeliveryServiceOutOfProcessComponentTest {
3433

3534
@Configuration
3635
@EnableJpaRepositories
37-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
36+
@EnableAutoConfiguration
3837
@Import({TramJdbcKafkaConfiguration.class, TramEventsPublisherConfiguration.class
3938
})
4039
public static class Config {

‎ftgo-delivery-service/src/integration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/CourierJpaTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.chrisrichardson.ftgo.deliveryservice.domain;
22

33
import io.eventuate.tram.spring.consumer.jdbc.TramConsumerJdbcAutoConfiguration;
4-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
76
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +22,7 @@ public class CourierJpaTest {
2322

2423
@Configuration
2524
@EnableJpaRepositories
26-
@EnableAutoConfiguration(exclude = {TramConsumerJdbcAutoConfiguration.class, CommonSwaggerConfiguration.class})
25+
@EnableAutoConfiguration(exclude = TramConsumerJdbcAutoConfiguration.class)
2726
public static class Config {
2827
}
2928

‎ftgo-delivery-service/src/integration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/DeliveryJpaTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.chrisrichardson.ftgo.deliveryservice.domain;
22

33
import io.eventuate.tram.spring.consumer.jdbc.TramConsumerJdbcAutoConfiguration;
4-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
76
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,7 @@ public class DeliveryJpaTest {
1918

2019
@Configuration
2120
@EnableJpaRepositories
22-
@EnableAutoConfiguration(exclude = {TramConsumerJdbcAutoConfiguration.class, CommonSwaggerConfiguration.class})
21+
@EnableAutoConfiguration(exclude = TramConsumerJdbcAutoConfiguration.class)
2322
public static class Config {
2423
}
2524

‎ftgo-delivery-service/src/integration-test/java/net/chrisrichardson/ftgo/deliveryservice/domain/RestaurantJpaTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.chrisrichardson.ftgo.deliveryservice.domain;
22

33
import io.eventuate.tram.spring.consumer.jdbc.TramConsumerJdbcAutoConfiguration;
4-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
54
import org.junit.Test;
65
import org.junit.runner.RunWith;
76
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,7 @@ public class RestaurantJpaTest {
2019

2120
@Configuration
2221
@EnableJpaRepositories
23-
@EnableAutoConfiguration(exclude = {TramConsumerJdbcAutoConfiguration.class, CommonSwaggerConfiguration.class})
22+
@EnableAutoConfiguration(exclude = TramConsumerJdbcAutoConfiguration.class)
2423
public static class Config {
2524
}
2625

‎ftgo-kitchen-service-api/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
3-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant:$eventuateTramSagasVersion"
4-
compile "io.eventuate.tram.core:eventuate-tram-spring-events:$eventuateTramVersion"
3+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-participant"
4+
compile "io.eventuate.tram.core:eventuate-tram-spring-events"
55
compile project(":ftgo-common")
66

77
}

‎ftgo-kitchen-service/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ dependencies {
4444

4545
ftgoApiSpecification project(":ftgo-restaurant-service-api-spec")
4646

47-
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka:$eventuateTramVersion"
48-
compile "io.eventuate.tram.core:eventuate-tram-spring-events:$eventuateTramVersion"
49-
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging:$eventuateTramVersion"
50-
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl:$eventuateTramSagasVersion"
47+
compile "io.eventuate.tram.core:eventuate-tram-spring-jdbc-kafka"
48+
compile "io.eventuate.tram.core:eventuate-tram-spring-events"
49+
compile "io.eventuate.tram.core:eventuate-tram-spring-messaging"
50+
compile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-orchestration-simple-dsl"
5151

5252
compile project(":common-swagger")
5353
compile project(":ftgo-common-jpa")
5454
compile project(":ftgo-kitchen-service-api")
5555
compile project(":ftgo-restaurant-service-api")
56-
compile "io.eventuate.tram.core:eventuate-tram-aggregate-domain-events:$eventuateTramVersion"
56+
compile "io.eventuate.tram.core:eventuate-tram-aggregate-domain-events"
5757

5858
compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion"
5959
compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
@@ -65,14 +65,14 @@ dependencies {
6565
}
6666

6767
testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
68-
testCompile "io.eventuate.tram.core:eventuate-tram-test-util:$eventuateTramVersion"
68+
testCompile "io.eventuate.tram.core:eventuate-tram-test-util"
6969

70-
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory:$eventuateTramSagasVersion"
71-
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory:$eventuateTramVersion"
70+
testCompile "io.eventuate.tram.sagas:eventuate-tram-sagas-spring-in-memory"
71+
testCompile "io.eventuate.tram.core:eventuate-tram-spring-in-memory"
7272
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
7373
testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
7474
testCompile "com.jayway.jsonpath:json-path:2.3.0"
75-
testCompile "io.eventuate.tram.core:eventuate-tram-spring-testing-support-cloud-contract:$eventuateTramVersion"
75+
testCompile "io.eventuate.tram.core:eventuate-tram-spring-testing-support-cloud-contract"
7676

7777
testCompile 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
7878
}

‎ftgo-kitchen-service/src/integration-test/java/net/chrisrichardson/ftgo/kitchenservice/contract/DeliveryserviceMessagingBase.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import io.eventuate.tram.spring.events.publisher.TramEventsPublisherConfiguration;
66
import io.eventuate.tram.spring.inmemory.TramInMemoryConfiguration;
77
import io.eventuate.tram.spring.cloudcontractsupport.EventuateContractVerifierConfiguration;
8-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
98
import net.chrisrichardson.ftgo.common.CommonJsonMapperInitializer;
109
import net.chrisrichardson.ftgo.kitchenservice.api.TicketDetails;
1110
import net.chrisrichardson.ftgo.kitchenservice.api.events.TicketAcceptedEvent;
@@ -34,7 +33,7 @@ public abstract class DeliveryserviceMessagingBase {
3433
}
3534

3635
@Configuration
37-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
36+
@EnableAutoConfiguration
3837
@Import({EventuateContractVerifierConfiguration.class, TramEventsPublisherConfiguration.class, TramInMemoryConfiguration.class, EventuateTransactionTemplateConfiguration.class})
3938
public static class TestConfiguration {
4039

‎ftgo-kitchen-service/src/integration-test/java/net/chrisrichardson/ftgo/kitchenservice/contract/MessagingBase.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package net.chrisrichardson.ftgo.kitchenservice.contract;
22

33
import io.eventuate.tram.spring.cloudcontractsupport.EventuateContractVerifierConfiguration;
4-
import io.eventuate.util.spring.swagger.CommonSwaggerConfiguration;
54
import net.chrisrichardson.ftgo.kitchenservice.api.TicketDetails;
65
import net.chrisrichardson.ftgo.kitchenservice.domain.KitchenService;
76
import net.chrisrichardson.ftgo.kitchenservice.domain.Ticket;
87
import net.chrisrichardson.ftgo.kitchenservice.messagehandlers.KitchenServiceMessageHandlersConfiguration;
98
import org.junit.Before;
109
import org.junit.runner.RunWith;
11-
import org.springframework.beans.factory.annotation.Autowired;
1210
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
1311
import org.springframework.boot.test.context.SpringBootTest;
1412
import org.springframework.boot.test.mock.mockito.MockBean;
1513
import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
16-
import org.springframework.context.annotation.Bean;
1714
import org.springframework.context.annotation.Configuration;
1815
import org.springframework.context.annotation.Import;
1916
import org.springframework.test.context.junit4.SpringRunner;
@@ -22,7 +19,6 @@
2219

2320
import static org.mockito.Matchers.any;
2421
import static org.mockito.Matchers.eq;
25-
import static org.mockito.Mockito.mock;
2622
import static org.mockito.Mockito.reset;
2723
import static org.mockito.Mockito.when;
2824

@@ -32,7 +28,7 @@
3228
public abstract class MessagingBase {
3329

3430
@Configuration
35-
@EnableAutoConfiguration(exclude = CommonSwaggerConfiguration.class)
31+
@EnableAutoConfiguration
3632
@Import({KitchenServiceMessageHandlersConfiguration.class, EventuateContractVerifierConfiguration.class})
3733
public static class TestConfiguration {
3834

0 commit comments

Comments
 (0)
Please sign in to comment.