You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/20 02:03:28 UTC
svn commit: r1172912 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java
Author: dkulp
Date: Tue Sep 20 00:03:27 2011
New Revision: 1172912
URL: http://svn.apache.org/viewvc?rev=1172912&view=rev
Log:
Merged revisions 1163705 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1163705 | hadrian | 2011-08-31 13:10:53 -0400 (Wed, 31 Aug 2011) | 1 line
CAMEL-4392. Fix side effect of LRUCache not a service.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java?rev=1172912&r1=1172911&r2=1172912&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java Tue Sep 20 00:03:27 2011
@@ -22,11 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.camel.Service;
import org.apache.camel.TypeConverter;
import org.apache.camel.util.LRUSoftCache;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,14 +34,14 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class PropertyEditorTypeConverter implements TypeConverter, Service {
+public class PropertyEditorTypeConverter implements TypeConverter {
private static final Logger LOG = LoggerFactory.getLogger(PropertyEditorTypeConverter.class);
// use a soft bound cache to avoid using too much memory in case a lot of different classes
// is being converted to string
- private final Map<Class, Class> misses = new LRUSoftCache<Class, Class>(1000);
+ private final Map<Class<?>, Class<?>> misses = new LRUSoftCache<Class<?>, Class<?>>(1000);
// we don't anticipate so many property editors so we have unbounded map
- private final Map<Class, PropertyEditor> cache = new HashMap<Class, PropertyEditor>();
+ private final Map<Class<?>, PropertyEditor> cache = new HashMap<Class<?>, PropertyEditor>();
public <T> T convertTo(Class<T> type, Object value) {
// We can't convert null values since we can't figure out a property
@@ -58,14 +56,14 @@ public class PropertyEditorTypeConverter
return ObjectHelper.cast(type, value);
}
- Class key = type;
+ Class<?> key = type;
PropertyEditor editor = lookupEditor(key);
if (editor != null) {
editor.setAsText(value.toString());
return ObjectHelper.cast(type, editor.getValue());
}
} else if (type == String.class) {
- Class key = value.getClass();
+ Class<?> key = value.getClass();
PropertyEditor editor = lookupEditor(key);
if (editor != null) {
editor.setValue(value);
@@ -76,7 +74,7 @@ public class PropertyEditorTypeConverter
return null;
}
- private PropertyEditor lookupEditor(Class type) {
+ private PropertyEditor lookupEditor(Class<?> type) {
// check misses first
if (misses.containsKey(type)) {
LOG.trace("No previously found property editor for type: {}", type);
@@ -115,14 +113,4 @@ public class PropertyEditorTypeConverter
public <T> T mandatoryConvertTo(Class<T> type, Exchange exchange, Object value) {
return convertTo(type, value);
}
-
- public void start() throws Exception {
- ServiceHelper.startService(misses);
- }
-
- public void stop() throws Exception {
- cache.clear();
- ServiceHelper.stopService(misses);
- }
-
}
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java?rev=1172912&r1=1172911&r2=1172912&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/bean/BeanComponentCustomCreateEndpointTest.java Tue Sep 20 00:03:27 2011
@@ -47,11 +47,11 @@ public class BeanComponentCustomCreateEn
public void testCreateEndpointUri() throws Exception {
BeanComponent bc = context.getComponent("bean", BeanComponent.class);
- ProcessorEndpoint pe = bc.createEndpoint(new MyFooBean(), "cheese");
+ ProcessorEndpoint pe = bc.createEndpoint(new MyFooBean(), "bean:cheese");
assertNotNull(pe);
String uri = pe.getEndpointUri();
- assertEquals("cheese", uri);
+ assertEquals("bean:cheese", uri);
Producer producer = pe.createProducer();
Exchange exchange = producer.createExchange();