fixed bad merges

Author: ag060

apps/api-runtime/src/main/java/com/akto/runtime/APICatalogSync.java

@@ -243,12 +243,6 @@
             <artifactId>commons-csv</artifactId>
             <version>1.9.0</version>
         </dependency>
-        <dependency>
-            <artifactId>grpc-api</artifactId>
-            <groupId>io.grpc</groupId>
-            <version>1.68.1</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

apps/dashboard/pom.xml

@@ -42,21 +42,18 @@ public SuspectSampleDataAction() {
   }
 
   public String fetchSampleData() {
-    HttpPost post =
-        new HttpPost(
-            String.format("%s/api/dashboard/list_malicious_requests", this.getBackendUrl()));
+    HttpPost post = new HttpPost(String.format("%s/api/dashboard/list_malicious_requests", this.getBackendUrl()));
     post.addHeader("Authorization", "Bearer " + this.getApiToken());
     post.addHeader("Content-Type", "application/json");
 
     System.out.print("API Token: " + this.getApiToken());
 
-    Map<String, Object> body =
-        new HashMap<String, Object>() {
-          {
-            put("skip", skip);
-            put("limit", LIMIT);
-          }
-        };
+    Map<String, Object> body = new HashMap<String, Object>() {
+      {
+        put("skip", skip);
+        put("limit", LIMIT);
+      }
+    };
     String msg = objectMapper.valueToTree(body).toString();
 
     System.out.println("Request body for list malicious requests" + msg);
@@ -70,24 +67,22 @@ public String fetchSampleData() {
       System.out.println(responseBody);
 
       ProtoMessageUtils.<ListMaliciousRequestsResponse>toProtoMessage(
-              ListMaliciousRequestsResponse.class, responseBody)
+          ListMaliciousRequestsResponse.class, responseBody)
           .ifPresent(
               m -> {
-                this.maliciousEvents =
-                    m.getMaliciousEventsList().stream()
-                        .map(
-                            smr ->
-                                new DashboardMaliciousEvent(
-                                    smr.getId(),
-                                    smr.getActor(),
-                                    smr.getFilterId(),
-                                    smr.getEndpoint(),
-                                    URLMethods.Method.fromString(smr.getMethod()),
-                                    smr.getApiCollectionId(),
-                                    smr.getIp(),
-                                    smr.getCountry(),
-                                    smr.getDetectedAt()))
-                        .collect(Collectors.toList());
+                this.maliciousEvents = m.getMaliciousEventsList().stream()
+                    .map(
+                        smr -> new DashboardMaliciousEvent(
+                            smr.getId(),
+                            smr.getActor(),
+                            smr.getFilterId(),
+                            smr.getEndpoint(),
+                            URLMethods.Method.fromString(smr.getMethod()),
+                            smr.getApiCollectionId(),
+                            smr.getIp(),
+                            smr.getCountry(),
+                            smr.getDetectedAt()))
+                    .collect(Collectors.toList());
               });
     } catch (Exception e) {
       e.printStackTrace();
@@ -98,8 +93,7 @@ public String fetchSampleData() {
   }
 
   public String fetchFilters() {
-    HttpGet get =
-        new HttpGet(String.format("%s/api/dashboard/fetch_filters", this.getBackendUrl()));
+    HttpGet get = new HttpGet(String.format("%s/api/dashboard/fetch_filters", this.getBackendUrl()));
     get.addHeader("Authorization", "Bearer " + this.getApiToken());
     get.addHeader("Content-Type", "application/json");
 
@@ -109,7 +103,7 @@ public String fetchFilters() {
       System.out.println(responseBody);
 
       ProtoMessageUtils.<FetchAlertFiltersResponse>toProtoMessage(
-              FetchAlertFiltersResponse.class, responseBody)
+          FetchAlertFiltersResponse.class, responseBody)
           .ifPresent(
               msg -> {
                 this.ips = msg.getActorsList();

apps/dashboard/src/main/java/com/akto/action/threat_detection/SuspectSampleDataAction.java

@@ -48,7 +48,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
 
             HashMap<String, FeatureAccess> featureWiseAllowed = organization.getFeatureWiseAllowed();
 
-            if (featureWiseAllowed == null || featureWiseAllowed.isEmpty()) {
+            if(featureWiseAllowed == null || featureWiseAllowed.isEmpty()) {
                 throw new Exception("feature map not found or empty for organization " + organization.getId());
             }
 
@@ -58,7 +58,7 @@ public String intercept(ActionInvocation invocation) throws Exception {
             for (String feature : features) {
                 feature = feature.trim();
 
-                if (feature.isEmpty()) {
+                if(feature.isEmpty()) {
                     continue;
                 }