Fix Filter Lifecycle (#94)

flipkart-incubator · Aug 10, 2024 · 98abf95 · 98abf95
1 parent 0369cd4
commit 98abf95
Show file tree

Hide file tree

Showing 7 changed files with 365 additions and 315 deletions.
diff --git a/core/src/main/java/com/flipkart/gjex/core/Bundle.java b/core/src/main/java/com/flipkart/gjex/core/Bundle.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import com.flipkart.gjex.core.filter.grpc.GrpcFilter;
+import com.flipkart.gjex.core.filter.http.HttpFilter;
 import com.flipkart.gjex.core.job.ScheduledJob;
 import org.glassfish.jersey.server.ResourceConfig;
 
@@ -56,11 +57,18 @@ public interface Bundle<T extends GJEXConfiguration, U extends Map> {
     List<Service> getServices();
 
     /**
-     * Returns Filter instances loaded by this Bundle
-     * @return List containing Filter instances
+     * Returns GrpcFilter instances loaded by this Bundle
+     * @return List containing GrpcFilter instances
      */
 	List<GrpcFilter> getGrpcFilters();
 
+
+    /**
+     * Returns HTTPFilter instances loaded by this Bundle
+     * @return List containing HttpFilter instances
+     */
+    List<HttpFilter> getHTTPFilters();
+
     /**
      * Returns HealthCheck instances loaded by this Bundle
      * @return List containing HealthCheck instances

diff --git a/core/src/main/java/com/flipkart/gjex/core/filter/Filter.java b/core/src/main/java/com/flipkart/gjex/core/filter/Filter.java
@@ -26,7 +26,12 @@
 public abstract class Filter<Req, Res, M> {
 
     /**
-     * Lifecycle methods for cleaning up resources used by this Filter
+     * Lifecycle method for initializing resources used by this Filter.
+     */
+    public void init() {}
+
+    /**
+     * Lifecycle method for cleaning up resources used by this Filter.
      */
     public void destroy() {}
 

diff --git a/core/src/main/java/com/flipkart/gjex/core/filter/grpc/AccessLogGrpcFilter.java b/core/src/main/java/com/flipkart/gjex/core/filter/grpc/AccessLogGrpcFilter.java
@@ -21,6 +21,7 @@
 import com.google.protobuf.GeneratedMessageV3;
 import io.grpc.Metadata;
 import io.grpc.Status;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 
 import java.util.Map;
@@ -83,8 +84,8 @@ public void doProcessRequest(R req, RequestParams<Metadata> requestParamsInput)
             .resourcePath(requestParamsInput.getResourcePath());
 
         Map<String, String> headers = requestParamsInput.getMetadata().keys().stream()
-            .collect(Collectors.toMap(key -> key, key ->
-                Optional.ofNullable(requestParamsInput.getMetadata().get(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER))).orElse("")
+            .collect(Collectors.toMap(String::toLowerCase, key ->
+                Optional.ofNullable(requestParamsInput.getMetadata().get(Metadata.Key.of(key, Metadata.ASCII_STRING_MARSHALLER))).orElse(StringUtils.EMPTY)
             ));
 
         accessLogContextBuilder.headers(headers);

diff --git a/core/src/main/java/com/flipkart/gjex/core/filter/grpc/GrpcFilter.java b/core/src/main/java/com/flipkart/gjex/core/filter/grpc/GrpcFilter.java
@@ -29,9 +29,6 @@
 public abstract class GrpcFilter<Req extends GeneratedMessageV3, Res extends GeneratedMessageV3>
 		extends Filter<Req,Res, Metadata> {
 
-	/** Lifecycle methods for initializing and cleaning up resources used by this Filter*/
-	public void init(){}
-
 	/**
 	 * Function for creating an instance of this {@link Filter}
 	 * Use only this function to get the {@link Filter} instance