Changeset 657

Timestamp:

2008-10-02 14:35:05 (5 years ago)

Author:

bruno

Message:

Templates: variables: introduced a new boolean attribute 'overwrite' which can be used to indicate that a variable should only be set if there was no value already associated with the variable name. This is useful for prototyping.

Location:

trunk/universe/kauri-template/src

Files:

• main/java/org/kauriproject/template/VariableBlock.java (modified) (5 diffs)
• test/java/org/kauriproject/template/TemplateExecutionTest.java (modified) (1 diff)
• test/resources/org/kauriproject/template/variable_from_src.xml (modified) (1 diff)
• test/resources/org/kauriproject/template/variable_from_src_result.xml (modified) (1 diff)

trunk/universe/kauri-template/src/main/java/org/kauriproject/template/VariableBlock.java

@@ -34 +34 @@
 public class VariableBlock extends TemplateBlock {
 
-    protected static Log log = LogFactory.getLog(VariableBlock.class);
+    private static Log log = LogFactory.getLog(VariableBlock.class);
 
     // VARIABLE CONSTANTS
-    public static final String NAME = "name";
-    public static final String VALUE = "value";
-    public static final String SRC = "src";
+    private static final String NAME = "name";
+    private static final String VALUE = "value";
+    private static final String SRC = "src";
+    private static final String OVERWRITE = "overwrite";
 
     // typical block stuff
@@ -47 +48 @@
 
     // EL
-    protected ELFacade elFacade;
+    private ELFacade elFacade;
     private String baseURI;
 
@@ -75 +76 @@
         private final Expression valueExpression;
         private final Expression srcExpression;
+        private final boolean overwrite;
 
         // compiledNext: first following instruction
@@ -96 +98 @@
                 srcExpression = null;
             }
+
+            overwrite = !"false".equalsIgnoreCase(attributes.getValue(OVERWRITE));
         }
 
@@ -101 +105 @@
         public Step executeAndProceed(ExecutionContext context, TemplateResult result) throws SAXException {
             TemplateContext tmplContext = context.getTemplateContext();
-            if (valueExpression != null) {
-                final Object value = valueExpression.evaluate(context.getTemplateContext());
-                tmplContext.put(name, value);
-            } else if (srcExpression != null) {
-                Object data = loadFromSrc(context);
-                tmplContext.put(name, data);
-            } else {
-                // use element body as value
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                KauriSaxHandler ksh = new KauriSaxHandler(bos, OutputFormat.TEXT, "UTF-8", true, true);
-                TemplateResult buffer = new TemplateResultImpl(ksh);
-                buffer.startDocument();
-                Step next = this.getCompiledNext();
-                while (next != endStep) {
-                    next = next.executeAndProceed(context, buffer);
+            if (overwrite || !tmplContext.containsKey(name)) {
+                if (valueExpression != null) {
+                    final Object value = valueExpression.evaluate(context.getTemplateContext());
+                    tmplContext.put(name, value);
+                } else if (srcExpression != null) {
+                    Object data = loadFromSrc(context);
+                    tmplContext.put(name, data);
+                } else {
+                    // use element body as value
+                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                    KauriSaxHandler ksh = new KauriSaxHandler(bos, OutputFormat.TEXT, "UTF-8", true, true);
+                    TemplateResult buffer = new TemplateResultImpl(ksh);
+                    buffer.startDocument();
+                    Step next = this.getCompiledNext();
+                    while (next != endStep) {
+                        next = next.executeAndProceed(context, buffer);
+                    }
+                    buffer.endDocument();
+                    buffer.flush();
+                    String value = "";
+                    try {
+                        bos.flush();
+                        value = bos.toString("UTF-8");
+                    } catch (IOException ex) {
+                        log.error(ex);
+                    }
+
+                    tmplContext.put(name, value);
                 }
-                buffer.endDocument();
-                buffer.flush();
-                String value = "";
-                try {
-                    bos.flush();
-                    value = bos.toString("UTF-8");
-                } catch (IOException ex) {
-                    log.error(ex);
-                }
-
-                tmplContext.put(name, value);
             }
             return endStep.getCompiledNext();

trunk/universe/kauri-template/src/test/java/org/kauriproject/template/TemplateExecutionTest.java

@@ -132 +132 @@
 
     public void testVariableFromSrc() throws Exception {
-        testFlow("/org/kauriproject/template/variable_from_src.xml", true);        
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put("overwriteTest1", "overwriteTest1 - external value");
+        parameters.put("overwriteTest2", "overwriteTest2 - external value");
+        testFlow("/org/kauriproject/template/variable_from_src.xml", parameters, true);
     }
 

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src.xml

@@ -2 +2 @@
 <root xmlns:ktl="http://kauriproject.org/template">
     <ktl:variable name="data" src="data.json"/>
-  ${data.message}
+  <ktl:variable name="overwriteTest1" value="local"/>
+  <ktl:variable name="overwriteTest2" value="local" overwrite="false"/>
+
+  ${data.message},${overwriteTest1},${overwriteTest2}
 </root>

trunk/universe/kauri-template/src/test/resources/org/kauriproject/template/variable_from_src_result.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root xmlns:ktl="http://kauriproject.org/template">
-  Hello world!
+  Hello world!,local,overwriteTest2 - external value
 </root>