Skip to content

Commit 88d1a3a

Browse files
committed
Finding @TestConfiguration presence with AnnotationUtils, removed unnecessary dependency
1 parent 89004b0 commit 88d1a3a

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

grpc-client-spring-boot-autoconfigure/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ dependencies {
1515

1616
api project(':grpc-common-spring-boot')
1717
api 'org.springframework.boot:spring-boot-starter'
18-
api 'org.springframework.boot:spring-boot-starter-test'
1918
optionalSupportImplementation 'org.springframework.boot:spring-boot-starter-actuator'
2019
optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
2120
optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/inject/GrpcClientBeanPostProcessor.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.beans.factory.BeanDefinitionStoreException;
3434
import org.springframework.beans.factory.config.BeanPostProcessor;
3535
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
36-
import org.springframework.boot.test.context.TestConfiguration;
3736
import org.springframework.context.ApplicationContext;
3837
import org.springframework.context.ConfigurableApplicationContext;
3938
import org.springframework.context.annotation.Configuration;
@@ -325,15 +324,14 @@ private String getBeanName(final GrpcClientBean grpcClientBean) {
325324
}
326325

327326
/**
328-
* The method is used to check for the presence of an annotation {@link Configuration} or {@link TestConfiguration}
327+
* The method is used to check for the presence of an annotation {@link Configuration}
329328
*
330329
* @param clazz instance of the class
331330
* @return does the class have an annotation or not
332331
*/
333332
private boolean isAnnotatedWithConfiguration(final Class<?> clazz) {
334-
final Configuration[] configurationAnnotation = clazz.getAnnotationsByType(Configuration.class);
335-
final TestConfiguration[] testConfigurationAnnotation = clazz.getAnnotationsByType(TestConfiguration.class);
336-
return configurationAnnotation.length != 0 || testConfigurationAnnotation.length != 0;
333+
final Configuration configurationAnnotation = AnnotationUtils.findAnnotation(clazz, Configuration.class);
334+
return configurationAnnotation != null;
337335
}
338336

339337
}

0 commit comments

Comments
 (0)