X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FCQLBatchLoop.java;h=9bb2fa329b0031a24d9578ccfd0f14ae36bcf62e;hb=165e298554f06ecd0545df604e11736ebf71566d;hp=1a1bdf331264452cca28fc557e0750906bdc6ec8;hpb=ead4ecf2e8b069f40596992d72047a5f38a7af4d;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatchLoop.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatchLoop.java
index 1a1bdf33..9bb2fa32 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatchLoop.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatchLoop.java
@@ -3,13 +3,14 @@
  * org.onap.aaf
  * ===========================================================================
  * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
  * ===========================================================================
  * 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.
@@ -22,7 +23,7 @@ package org.onap.aaf.auth.batch.helpers;
 
 public class CQLBatchLoop {
     private static final int MAX_CHARS = (50 * 1024)/2;
-    
+
     private final CQLBatch cqlBatch;
     private final int maxBatch;
     private final StringBuilder sb;
@@ -53,16 +54,15 @@ public class CQLBatchLoop {
      * @return
      */
     public StringBuilder inc() {
-        if(i>=maxBatch || current.length()+sb.length()>MAX_CHARS) {
-            if(i>0) {
+        if((i>=maxBatch || current.length() + sb.length() > MAX_CHARS) && (i > 0)) {
+
                 cqlBatch.execute(dryRun);
                 i = -1;
                 incBatch();
-            }
-        }
-        if(i<0) {
+    }
+        if(i < 0) {
             cqlBatch.begin();
-            i=0;
+            i = 0;
         }
         if(current.length() > MAX_CHARS) {
             cqlBatch.singleExec(current, dryRun);
@@ -74,23 +74,23 @@ public class CQLBatchLoop {
         ++total;
         return current;
     }
-    
+
     /**
      * Close up when finished.
      */
     public void flush() {
-        if(current.length()+sb.length()>MAX_CHARS) {
-            if(i>0) {
+        if(current.length() + sb.length() > MAX_CHARS) {
+            if(i > 0) {
                 cqlBatch.execute(dryRun);
                 incBatch();
             }
-            if(current.length()>0) {
+            if(current.length() > 0) {
                 cqlBatch.singleExec(current, dryRun);
                 current.setLength(0);
                 incBatch();
             }
         } else {
-            if(i<0) {
+            if(i < 0) {
                 cqlBatch.begin();
             }
             sb.append(current);
@@ -98,23 +98,23 @@ public class CQLBatchLoop {
             cqlBatch.execute(dryRun);
             incBatch();
         }
-        i=-1;
+        i = -1;
     }
 
     private void incBatch() {
         ++batches;
         if(showProgress) {
             System.out.print('.');
-            if(batches%70==0) {
+            if(batches%70 == 0) {
                 System.out.println();
-            } 
+            }
         }
     }
 
     public int total() {
         return total;
     }
-    
+
     public int batches() {
         return batches;
     }
@@ -124,7 +124,7 @@ public class CQLBatchLoop {
         batches = 0;
         i = -1;
     }
-    
+
     public String toString() {
         return cqlBatch.toString();
     }