From 0d6bcc4cd0aea32276df175c47259421eb095085 Mon Sep 17 00:00:00 2001
From: Lisa Davidson <xdavidson@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:29:49 -0400
Subject: [PATCH] CCS-4351-bugfixes_NullPointerException (#579)

* fix null pointer exception
---
 .../pantheon/auth/keycloak/KeycloakFilter.java    |  2 +-
 .../pantheon/servlet/DocumentPreviewFilter.java   |  2 +-
 .../servlet/util/VersionUploadOperation.java      |  2 +-
 .../validation/helper/XrefValidationHelper.java   | 15 ++++++++++-----
 .../validation/validators/XrefValidator.java      |  3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
index d31a128d9..c689c1d7e 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
@@ -49,7 +49,7 @@ public class KeycloakFilter extends KeycloakOIDCFilter implements Filter {
 
     private static final Logger log = LoggerFactory.getLogger(KeycloakFilter.class.getName());
     private static final String KARAF_ETC = "karaf.etc";
-    private  static final String KEYCLOAKOIDCFILTER_CONFIG_FILE_NAME = "keycloak.json";
+    private static final String KEYCLOAKOIDCFILTER_CONFIG_FILE_NAME = "keycloak.json";
     protected KeycloakDeployment keycloakDeployment;
     private PathBasedKeycloakConfigResolver keycloakConfigResolver;
     /**
diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/DocumentPreviewFilter.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/DocumentPreviewFilter.java
index 22502f199..661394fa4 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/DocumentPreviewFilter.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/DocumentPreviewFilter.java
@@ -59,7 +59,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             }
             // FIXME - need to rework document preview servlets to support latest suffix (variant preview servlet already works)
             String forwardString = firstResource.get().getPath() + ".preview/" + mode;
-            XrefValidationHelper.initList();
+            new XrefValidationHelper().initList();
             request.getRequestDispatcher(forwardString).forward(request, response);
         } catch (RepositoryException e) {
             throw new ServletException(e);
diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/util/VersionUploadOperation.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/util/VersionUploadOperation.java
index 59b9e452a..8bb1e17e3 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/util/VersionUploadOperation.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/servlet/util/VersionUploadOperation.java
@@ -127,7 +127,7 @@ protected void versionUpload(SlingHttpServletRequest request,
             resolver.commit();
 
             Map<String, Object> context = asciidoctorService.buildContextFromRequest(request);
-            XrefValidationHelper.initList();
+            new XrefValidationHelper().initList();
             asciidoctorService.getDocumentHtml(document, localeObj, document.getWorkspace().getCanonicalVariantName(),
                     true, context, true);
 
diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/helper/XrefValidationHelper.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/helper/XrefValidationHelper.java
index 7a52592f1..fbae9476e 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/helper/XrefValidationHelper.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/helper/XrefValidationHelper.java
@@ -8,19 +8,24 @@
 
 public class XrefValidationHelper {
 
-    private static List<String> xRefs;
+    private List<String> xRefs;
+
+    public XrefValidationHelper() {
+        initList();
+    }
+
+    public List<String> getObjectsToValidate() {
 
-    public static List<String> getObjectsToValidate() {
         return xRefs;
     }
 
-    public static void initList() {
+    public void initList() {
         xRefs = new ArrayList<>();
     }
 
-    public static void setObjectsToValidate(List<String> objectsToValidate) {
+    public void setObjectsToValidate(List<String> objectsToValidate) {
         if(objectsToValidate.size()>0){
-                xRefs.addAll(objectsToValidate);
+            xRefs.addAll(objectsToValidate);
         }
     }
 }
diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/validators/XrefValidator.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/validators/XrefValidator.java
index 954455b79..a74eba5b2 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/validators/XrefValidator.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/validation/validators/XrefValidator.java
@@ -67,7 +67,8 @@ private Violations checkIfXrefValid(Violations violations) {
     private ErrorDetails checkXref() {
         ErrorDetails errorDetails = new ErrorDetails();
         try {
-            List<String>  xrefTargets = XrefValidationHelper.getObjectsToValidate();
+            XrefValidationHelper xrefValidationHelper = new XrefValidationHelper();
+            List<String>  xrefTargets = xrefValidationHelper.getObjectsToValidate();
             if(null == xrefTargets || xrefTargets.size()==0){
                 return errorDetails;
             }