Batch Test improvements

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / util / CSV.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/util/CSV.java b/cadi/core/src/main/java/org/onap/aaf/cadi/util/CSV.java
index 1d60ae5..47de84e 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/util/CSV.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/util/CSV.java
@@ -44,6 +44,7 @@ public class CSV {
        private File csv;
        private Access access;
        private boolean processAll;
+       private char delimiter = ',';
        
        public CSV(Access access, File file) {
                this.access = access;
@@ -57,6 +58,11 @@ public class CSV {
                processAll = false;
        }
        
+       public CSV setDelimiter(char delimiter) {
+               this.delimiter = delimiter;
+               return this;
+       }
+       
        public String name() {
                return csv.getName();
        }
@@ -116,16 +122,17 @@ public class CSV {
                                                                        escape = true;
                                                                }
                                                                break;
-                                                       case ',':
-                                                               if(quotes) {
-                                                                       sb.append(c);
+                                                       default:
+                                                               if(delimiter==c) {
+                                                                       if(quotes) {
+                                                                               sb.append(c);
+                                                                       } else {
+                                                                               row.add(sb.toString());
+                                                                               sb.setLength(0);
+                                                                       }
                                                                } else {
-                                                                       row.add(sb.toString());
-                                                                       sb.setLength(0);
+                                                                       sb.append(c);
                                                                }
-                                                               break;
-                                                       default:
-                                                               sb.append(c);
                                                }
                                        }
                                        if(sb.length()>0 || c==',') {