Skip to content

Commit 4bafc9e

Browse files
committed
comments resolve
1 parent 8c765ff commit 4bafc9e

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tasks.withType(GenerateModuleMetadata) {
2727
enabled = false
2828
}
2929

30-
def gJEXVersion = '1.43-SNAPSHOT-3'
30+
def gJEXVersion = '1.43-SNAPSHOT-4'
3131
def grpcVersion = '1.60.0'
3232
def jacksonVersion = '2.16.1'
3333
def guiceVersion = '5.1.0'

core/src/main/java/com/flipkart/gjex/core/filter/grpc/AccessLogGrpcFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void doHandleException(Exception e) {
148148
public GrpcFilter configure(GrpcFilterConfig grpcFilterConfig) {
149149
if (grpcFilterConfig.isEnableAccessLogs()){
150150
AccessLogGrpcFilter accessLogGrpcFilter = new AccessLogGrpcFilter();
151-
if (org.apache.commons.lang.StringUtils.isNotBlank(grpcFilterConfig.getAccessLogFormat())){
151+
if (org.apache.commons.lang.StringUtils.isNotEmpty(grpcFilterConfig.getAccessLogFormat())){
152152
AccessLogGrpcFilter.setFormat(grpcFilterConfig.getAccessLogFormat());
153153
}
154154
return accessLogGrpcFilter;

guice/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ dependencies {
6161
implementation libraries.hystrix_metrics_stream
6262
implementation libraries.rxjava2
6363

64+
implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.0'
65+
6466
implementation 'org.eclipse.jetty:jetty-server:9.4.56.v20240826'
6567
implementation 'org.eclipse.jetty:jetty-servlet:9.4.56.v20240826'
6668
implementation 'org.eclipse.jetty:jetty-webapp:9.4.56.v20240826'

guice/src/main/java/com/flipkart/gjex/grpc/interceptor/FilterInterceptor.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import io.grpc.ServerInterceptor;
3737
import io.grpc.Status;
3838
import io.grpc.StatusRuntimeException;
39+
import org.apache.commons.collections4.CollectionUtils;
3940

4041
import javax.inject.Named;
4142
import javax.inject.Singleton;
@@ -44,6 +45,7 @@
4445
import java.net.SocketAddress;
4546
import java.util.ArrayList;
4647
import java.util.Arrays;
48+
import java.util.Collections;
4749
import java.util.HashMap;
4850
import java.util.List;
4951
import java.util.Map;
@@ -226,7 +228,7 @@ private void detachContext(Context currentContext, Context previousContext) {
226228

227229
private void addAllStaticFilters(GrpcFilterConfig grpcFilterConfig, List<GrpcFilter> filtersForMethod, Map<Class<?>, GrpcFilter> classToInstanceMap) throws ClassNotFoundException {
228230
List<String> filterClasses = grpcFilterConfig.getFilterClasses();
229-
if (filterClasses != null && !filterClasses.isEmpty()) {
231+
if (CollectionUtils.isNotEmpty(filterClasses)) {
230232
for (String filterClass : filterClasses) {
231233
try {
232234
Class<?> clazz = Class.forName(filterClass);

0 commit comments

Comments
 (0)