From cb500c0534d9f8f6244e4d340d960f8a982ad2ff Mon Sep 17 00:00:00 2001
From: Noble Paul <noble@apache.org>
Date: Wed, 18 Nov 2009 13:24:06 +0000
Subject: [PATCH] SOLR-1547 TemplateTransformer should copy array/list more
 intelligently

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@881766 13f79535-47bb-0310-9956-ffa450edef68
---
 contrib/dataimporthandler/CHANGES.txt          |  1 +
 .../dataimport/TemplateTransformer.java        | 18 ++++++++++++++++--
 .../dataimport/TestTemplateTransformer.java    | 12 ++++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/contrib/dataimporthandler/CHANGES.txt b/contrib/dataimporthandler/CHANGES.txt
index f1609c04a2b..7bb2e2987e6 100644
--- a/contrib/dataimporthandler/CHANGES.txt
+++ b/contrib/dataimporthandler/CHANGES.txt
@@ -22,6 +22,7 @@ New Features
 ----------------------
 
 * SOLR-1525 allow DIH to refer to core properties (noble)
+* SOLR-1547 TemplateTransformer copy objects more intelligently when there when the template is a single variable (noble)
 
 Optimizations
 ----------------------
diff --git a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
index cc55c8e2da1..a13721bb48a 100644
--- a/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
+++ b/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
@@ -49,6 +49,7 @@ import org.slf4j.LoggerFactory;
 public class TemplateTransformer extends Transformer {
 
   private static final Logger LOG = LoggerFactory.getLogger(TemplateTransformer.class);
+  private Map<String ,List<String>> templateVsVars = new HashMap<String, List<String>>();
 
   @SuppressWarnings("unchecked")
   public Object transformRow(Map<String, Object> row, Context context) {
@@ -67,7 +68,7 @@ public class TemplateTransformer extends Transformer {
 
       // Verify if all variables can be resolved or not
       boolean resolvable = true;
-      List<String> variables = TemplateString.getVariables(expr);
+      List<String> variables = getVars(expr);
       for (String v : variables) {
         if (resolver.resolve(v) == null) {
           LOG.warn("Unable to resolve variable: " + v
@@ -78,13 +79,26 @@ public class TemplateTransformer extends Transformer {
 
       if (!resolvable)
         continue;
+      if(variables.size() == 1 && expr.startsWith("${") && expr.endsWith("}")){
+        row.put(column, resolver.resolve(variables.get(0)));
+      } else {
+        row.put(column, resolver.replaceTokens(expr));
+      }
 
-      row.put(column, resolver.replaceTokens(expr));
     }
 
 
     return row;
   }
 
+  private List<String> getVars(String expr) {
+    List<String> result = this.templateVsVars.get(expr);
+    if(result == null){
+      result = TemplateString.getVariables(expr);
+      this.templateVsVars.put(expr, result);
+    }
+    return result;
+  }
+
   public static final String TEMPLATE = "template";
 }
diff --git a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java b/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
index 78b7b094b0e..7fbf9ac9e23 100644
--- a/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
+++ b/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestTemplateTransformer.java
@@ -22,6 +22,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -43,14 +44,20 @@ public class TestTemplateTransformer {
     fields.add(AbstractDataImportHandlerTest.createMap("column", "name",
             TemplateTransformer.TEMPLATE,
             "${e.lastName}, ${e.firstName} ${e.middleName}"));
+    fields.add(AbstractDataImportHandlerTest.createMap("column", "emails",
+            TemplateTransformer.TEMPLATE,
+            "${e.mail}"));
+
     // test reuse of template output in another template 
     fields.add(AbstractDataImportHandlerTest.createMap("column", "mrname",
             TemplateTransformer.TEMPLATE,"Mr ${e.name}"));
-            
+
+    List<String> mails = Arrays.asList(new String[]{"a@b.com", "c@d.com"});
     Map row = AbstractDataImportHandlerTest.createMap(
             "firstName", "Shalin",
             "middleName", "Shekhar", 
-            "lastName", "Mangar");
+            "lastName", "Mangar",
+            "mail", mails);
 
     VariableResolverImpl resolver = new VariableResolverImpl();
     resolver.addNamespace("e", row);
@@ -62,6 +69,7 @@ public class TestTemplateTransformer {
     new TemplateTransformer().transformRow(row, context);
     Assert.assertEquals("Mangar, Shalin Shekhar", row.get("name"));
     Assert.assertEquals("Mr Mangar, Shalin Shekhar", row.get("mrname"));
+    Assert.assertEquals(mails,row.get("emails"));
   }
 
 }