Author: davsclaus
Date: Fri Jan 21 09:02:14 2011
New Revision: 1061692

URL: http://svn.apache.org/viewvc?rev=1061692&view=rev
Log:
CAMEL-3565: Properties component now trim values to accomodate issue when 
loading properties file which have trailing spaces.

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
      - copied, changed from r1061638, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java?rev=1061692&r1=1061691&r2=1061692&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/properties/DefaultPropertiesResolver.java
 Fri Jan 21 09:02:14 2011
@@ -20,6 +20,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.camel.CamelContext;
@@ -42,13 +43,16 @@ public class DefaultPropertiesResolver i
         for (String path : uri) {
             if (path.startsWith("ref:")) {
                 Properties prop = loadPropertiesFromRegistry(context, path);
+                prop = prepareLoadedProperties(prop);
                 answer.putAll(prop);
             } else if (path.startsWith("file:")) {
                 Properties prop = loadPropertiesFromFilePath(context, path);
+                prop = prepareLoadedProperties(prop);
                 answer.putAll(prop);
             } else {
                 // default to classpath
                 Properties prop = loadPropertiesFromClasspath(context, path);
+                prop = prepareLoadedProperties(prop);
                 answer.putAll(prop);
             }
         }
@@ -90,4 +94,31 @@ public class DefaultPropertiesResolver i
         return answer;
     }
 
+    /**
+     * Strategy to prepare loaded properties before being used by Camel.
+     * <p/>
+     * This implementation will ensure values are trimmed, as loading 
properties from
+     * a file with values having trailing spaces is not automatic trimmed by 
the Properties API
+     * from the JDK.
+     *
+     * @param properties  the properties
+     * @return the prepared properties
+     */
+    protected Properties prepareLoadedProperties(Properties properties) {
+        Properties answer = new Properties();
+        for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+            Object key = entry.getKey();
+            Object value = entry.getValue();
+            // trim string values which can be a problem when loading from a 
properties file and there
+            // is leading or trailing spaces in the value
+            if (value instanceof String) {
+                String s = (String) value;
+                s = s.trim();
+                value = s;
+            }
+            answer.put(key, value);
+        }
+        return answer;
+    }
+
 }

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
 (from r1061638, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java&r1=1061638&r2=1061692&rev=1061692&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentLoadPropertiesFromFileTrimValuesTest.java
 Fri Jan 21 09:02:14 2011
@@ -16,26 +16,43 @@
  */
 package org.apache.camel.component.properties;
 
+import java.io.File;
+import java.io.FileOutputStream;
+
 import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
 
 /**
  * @version $Revision$
  */
-public class PropertiesComponentLoadPropertiesFromFileTest extends 
PropertiesComponentTest {
+public class PropertiesComponentLoadPropertiesFromFileTrimValuesTest extends 
ContextTestSupport {
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
 
-        // remove created from super
-        context.removeComponent("properties");
+        // create space.properties file
+        deleteDirectory("target/space");
+        createDirectory("target/space");
+
+        File file = new File("target/space/space.properties");
+        file.createNewFile();
+        FileOutputStream fos = new FileOutputStream(file);
+        fos.write("cool.leading= Leading space\ncool.trailing=Trailing space 
\ncool.both= Both leading and trailing space ".getBytes());
+        fos.close();
 
         PropertiesComponent pc = new PropertiesComponent();
         pc.setCamelContext(context);
-        pc.setLocations(new 
String[]{"file:./src/test/resources/org/apache/camel/component/properties/myproperties.properties"});
+        pc.setLocations(new String[]{"file:target/space/space.properties"});
         context.addComponent("properties", pc);
 
         return context;
     }
 
+    public void testMustTrimValues() throws Exception {
+        assertEquals("Leading space", 
context.resolvePropertyPlaceholders("{{cool.leading}}"));
+        assertEquals("Trailing space", 
context.resolvePropertyPlaceholders("{{cool.trailing}}"));
+        assertEquals("Both leading and trailing space", 
context.resolvePropertyPlaceholders("{{cool.both}}"));
+    }
+
 }
\ No newline at end of file


Reply via email to