Skip to content

Commit c3671f1

Browse files
committed
Rename GrpcAdviceIsPresent to better reflect it being a condition
1 parent bc47440 commit c3671f1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package net.devh.boot.grpc.server.advice;
1919

20-
import java.util.Objects;
20+
import static java.util.Objects.requireNonNull;
2121

2222
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2323
import org.springframework.context.annotation.ConditionContext;
@@ -27,22 +27,22 @@
2727
/**
2828
* Condition to check if {@link GrpcAdvice @GrpcAdvice} is present. Mainly checking if {@link GrpcAdviceDiscoverer}
2929
* should be a instantiated.
30-
*
30+
*
3131
* @author Andjelko Perisic ([email protected])
3232
* @see GrpcAdviceDiscoverer
3333
*/
34-
public class GrpcAdviceIsPresent implements ConfigurationCondition {
34+
public class GrpcAdviceIsPresentCondition implements ConfigurationCondition {
3535

3636
@Override
3737
public ConfigurationPhase getConfigurationPhase() {
3838
return ConfigurationPhase.REGISTER_BEAN;
3939
}
4040

4141
@Override
42-
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
43-
44-
ConfigurableListableBeanFactory safeBeanFactory =
45-
Objects.requireNonNull(context.getBeanFactory(), "ConfigurableListableBeanFactory is null");
42+
public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
43+
final ConfigurableListableBeanFactory safeBeanFactory =
44+
requireNonNull(context.getBeanFactory(), "ConfigurableListableBeanFactory is null");
4645
return !safeBeanFactory.getBeansWithAnnotation(GrpcAdvice.class).isEmpty();
4746
}
47+
4848
}

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcAdviceAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import net.devh.boot.grpc.server.advice.GrpcAdviceDiscoverer;
3030
import net.devh.boot.grpc.server.advice.GrpcAdviceExceptionHandler;
3131
import net.devh.boot.grpc.server.advice.GrpcAdviceExceptionInterceptor;
32-
import net.devh.boot.grpc.server.advice.GrpcAdviceIsPresent;
32+
import net.devh.boot.grpc.server.advice.GrpcAdviceIsPresentCondition;
3333
import net.devh.boot.grpc.server.advice.GrpcExceptionHandler;
3434
import net.devh.boot.grpc.server.advice.GrpcExceptionHandlerMethodResolver;
3535
import net.devh.boot.grpc.server.interceptor.GrpcGlobalServerInterceptor;
@@ -47,7 +47,7 @@
4747
*/
4848
@Configuration(proxyBeanMethods = false)
4949
@EnableConfigurationProperties
50-
@Conditional(GrpcAdviceIsPresent.class)
50+
@Conditional(GrpcAdviceIsPresentCondition.class)
5151
@AutoConfigureBefore(GrpcServerFactoryAutoConfiguration.class)
5252
public class GrpcAdviceAutoConfiguration {
5353

0 commit comments

Comments
 (0)