From 0405eb74fb8d9467d7b4b6d9c10b221b2a8d25ed Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Mon, 13 Apr 2020 18:23:51 -0500
Subject: [PATCH] rollback escaping support in template, as it is global

---
 .../shared/from_long/to_string/Template.java  | 46 +++++++++----------
 .../shared/unary_string/TemplateTest.java     | 42 ++++++++---------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
index f108946be..436d9b48c 100644
--- a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
+++ b/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
@@ -94,7 +94,7 @@ public class Template implements LongFunction<String> {
                 pos = m.end();
             }
             String partial = template.substring(pos);
-            partial = unescape(partial);
+//            partial = unescape(partial);
             literals.add(partial);
             if (literals.size() != funcCount + 1) {
                 throw new RuntimeException("The number of {} place holders in '" + template + "' should equal the number of functions.");
@@ -105,28 +105,28 @@ public class Template implements LongFunction<String> {
         }
     }
 
-    // for testing
-    public String unescape(String partial) {
-        StringBuilder unescaped = new StringBuilder();
-        try {
-            Pattern escapes = Pattern.compile("\\\\.");
-            Matcher m = escapes.matcher(partial);
-            int pos = 0;
-
-            while (m.find()) {
-                String prefix = partial.substring(pos,m.start());
-                unescaped.append(prefix);
-                String segment = partial.substring(m.start(),m.end());
-                unescaped.append(segment.substring(1));
-                pos = m.end();
-            }
-            unescaped.append(partial.substring(pos));
-
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return unescaped.toString();
-    }
+//    // for testing
+//    public String unescape(String partial) {
+//        StringBuilder unescaped = new StringBuilder();
+//        try {
+//            Pattern escapes = Pattern.compile("\\\\.");
+//            Matcher m = escapes.matcher(partial);
+//            int pos = 0;
+//
+//            while (m.find()) {
+//                String prefix = partial.substring(pos,m.start());
+//                unescaped.append(prefix);
+//                String segment = partial.substring(m.start(),m.end());
+//                unescaped.append(segment.substring(1));
+//                pos = m.end();
+//            }
+//            unescaped.append(partial.substring(pos));
+//
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//        return unescaped.toString();
+//    }
 
     @Override
     public String apply(long value) {
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
index ffa77efbb..e4020fc7b 100644
--- a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
+++ b/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
@@ -52,25 +52,25 @@ public class TemplateTest {
         }
     }
 
-    @Test
-    public void testUnescaping() {
-        String escaped="front \\' back";
-        LongFunction<String> func = String::valueOf;
-        Template template = new Template("{} extra", func);
-        String unescaped = template.unescape(escaped);
-        assertThat(unescaped).isEqualTo("front ' back");
-
-        String unescaped2= template.unescape("\\' one \\' two \\'");
-        assertThat(unescaped2).isEqualTo("' one ' two '");
-    }
-
-    @Test
-    public void testBackslashUnescaping() {
-        String escaped="front \\\\\" back";
-        LongFunction<String> func = String::valueOf;
-        Template template = new Template("{} extra", func);
-        String unescaped = template.unescape(escaped);
-        assertThat(unescaped).isEqualTo("front \\\" back");
-
-    }
+//    @Test
+//    public void testUnescaping() {
+//        String escaped="front \\' back";
+//        LongFunction<String> func = String::valueOf;
+//        Template template = new Template("{} extra", func);
+//        String unescaped = template.unescape(escaped);
+//        assertThat(unescaped).isEqualTo("front ' back");
+//
+//        String unescaped2= template.unescape("\\' one \\' two \\'");
+//        assertThat(unescaped2).isEqualTo("' one ' two '");
+//    }
+//
+//    @Test
+//    public void testBackslashUnescaping() {
+//        String escaped="front \\\\\" back";
+//        LongFunction<String> func = String::valueOf;
+//        Template template = new Template("{} extra", func);
+//        String unescaped = template.unescape(escaped);
+//        assertThat(unescaped).isEqualTo("front \\\" back");
+//
+//    }
 }