Merge "restore a couple of fields' access to public"

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / helpers / Creator.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
index 152c633..d138943 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Creator.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,12 +26,24 @@ import com.datastax.driver.core.Row;
 public abstract class Creator<T> {
     public abstract T create(Row row);
     public abstract String select();
-    
+
+    public String suffix() {
+        return "";
+    }
+
     public String query(String where) {
         StringBuilder sb = new StringBuilder(select());
         if (where!=null) {
             sb.append(" WHERE ");
-            sb.append(where);
+            int index = where.indexOf(" ALLOW FILTERING");
+            if(index< 0 ) {
+                sb.append(where);
+                sb.append(suffix());
+            } else {
+                sb.append(where.substring(0, index));
+                sb.append(suffix());
+                sb.append(" ALLOW FILTERING");
+            }
         }
         sb.append(';');
         return sb.toString();