From a8842e962b2cf635e9a3bd9562927a9b31f16772 Mon Sep 17 00:00:00 2001
From: Shrikant Kandula <shrikant@appsmith.com>
Date: Wed, 22 Apr 2020 08:41:40 +0530
Subject: [PATCH] Fix NPE when accessing services before OPA is ready.

---
 .../src/main/java/com/appsmith/server/acl/OpaResponse.java  | 6 ++++--
 .../main/java/com/appsmith/server/filters/AclFilter.java    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/OpaResponse.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/OpaResponse.java
index 0784d3d219..f463b63296 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/OpaResponse.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/acl/OpaResponse.java
@@ -1,12 +1,14 @@
 package com.appsmith.server.acl;
 
-import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-@Getter
 @Setter
 @ToString
 public class OpaResponse {
     Boolean result;
+
+    public boolean isSuccessful() {
+        return Boolean.TRUE.equals(result);
+    }
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java
index fd09f64a45..7d814cadb3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/AclFilter.java
@@ -71,7 +71,7 @@ public class AclFilter implements WebFilter {
                     return acl;
                 })
                 .flatMap(acl -> {
-                    if (acl != null && acl.getResult()) {
+                    if (acl != null && acl.isSuccessful()) {
                         // Acl returned true. Continue with the filter chain
                         return chain.filter(exchange);
                     }