Skip to content

Commit cb259f6

Browse files
committed
minor fixes:
fixed method naming added dirtiesContext annotation to classes that shouldnt share the app context state using SpringApplication instead of unnecessary SpringApplicationBuilder
1 parent 832a3dc commit cb259f6

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/SpringAmqpConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Binding binding(Queue queue, DirectExchange exchange) {
3535
}
3636

3737
@Bean
38-
SimpleMessageListenerContainer SpringAmqpContainer(ConnectionFactory connectionFactory,
38+
SimpleMessageListenerContainer springAmqpContainer(ConnectionFactory connectionFactory,
3939
MessageListenerAdapter listenerAdapter) {
4040
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
4141
container.setConnectionFactory(connectionFactory);

spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/broadcast/BroadcastConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public List<Declarable> fanoutBindings() {
6161
}
6262

6363
@Bean
64-
public SimpleRabbitListenerContainerFactory BroadcastContainer(ConnectionFactory connectionFactory, SimpleRabbitListenerContainerFactoryConfigurer configurer) {
64+
public SimpleRabbitListenerContainerFactory broadcastContainer(ConnectionFactory connectionFactory, SimpleRabbitListenerContainerFactoryConfigurer configurer) {
6565
SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
6666
configurer.configure(factory, connectionFactory);
6767
return factory;

spring-protobuf/src/main/java/com/baeldung/protobuf/Application.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
package com.baeldung.protobuf;
22

3-
import com.baeldung.protobuf.BaeldungTraining.Course;
4-
import com.baeldung.protobuf.BaeldungTraining.Student;
5-
import com.baeldung.protobuf.BaeldungTraining.Student.PhoneNumber;
6-
import com.baeldung.protobuf.BaeldungTraining.Student.PhoneType;
3+
import java.util.ArrayList;
4+
import java.util.Arrays;
5+
import java.util.HashMap;
6+
import java.util.List;
7+
import java.util.Map;
78

9+
import org.springframework.boot.SpringApplication;
810
import org.springframework.boot.autoconfigure.SpringBootApplication;
9-
import org.springframework.boot.builder.SpringApplicationBuilder;
1011
import org.springframework.context.annotation.Bean;
1112
import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
1213
import org.springframework.web.client.RestTemplate;
1314

14-
import java.util.ArrayList;
15-
import java.util.Arrays;
16-
import java.util.HashMap;
17-
import java.util.List;
18-
import java.util.Map;
15+
import com.baeldung.protobuf.BaeldungTraining.Course;
16+
import com.baeldung.protobuf.BaeldungTraining.Student;
17+
import com.baeldung.protobuf.BaeldungTraining.Student.PhoneNumber;
18+
import com.baeldung.protobuf.BaeldungTraining.Student.PhoneType;
1919

2020
@SpringBootApplication
2121
public class Application {
2222

2323
public static void main(String[] args) {
24-
new SpringApplicationBuilder(Application.class).run(args);
24+
SpringApplication.run(Application.class, args);
2525
}
2626

2727
@Bean

spring-protobuf/src/test/java/com/baeldung/protobuf/ApplicationIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
import org.springframework.boot.test.context.SpringBootTest;
1717
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
1818
import org.springframework.http.ResponseEntity;
19+
import org.springframework.test.annotation.DirtiesContext;
1920
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
2021
import org.springframework.web.client.RestTemplate;
2122

2223
import com.baeldung.protobuf.BaeldungTraining.Course;
2324
import com.googlecode.protobuf.format.JsonFormat;
2425

26+
@DirtiesContext
2527
@RunWith(SpringJUnit4ClassRunner.class)
2628
@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.DEFINED_PORT)
2729
public class ApplicationIntegrationTest {

spring-protobuf/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import org.junit.Test;
44
import org.junit.runner.RunWith;
55
import org.springframework.boot.test.context.SpringBootTest;
6+
import org.springframework.test.annotation.DirtiesContext;
67
import org.springframework.test.context.junit4.SpringRunner;
78

89
import com.baeldung.protobuf.Application;
910

11+
@DirtiesContext
1012
@RunWith(SpringRunner.class)
1113
@SpringBootTest(classes = Application.class)
1214
public class SpringContextIntegrationTest {

0 commit comments

Comments
 (0)