You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/11/12 21:28:00 UTC
svn commit: r835531 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/converter/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/impl/scan/
camel-core/src/main/java/org/apache/camel/language/bean/ ca...
Author: hadrian
Date: Thu Nov 12 20:27:58 2009
New Revision: 835531
URL: http://svn.apache.org/viewvc?rev=835531&view=rev
Log:
Removing more warnings. About 1/4 done
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ClassResolver.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CaseInsensitiveMap.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/KeyValueHolder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java Thu Nov 12 20:27:58 2009
@@ -34,5 +34,5 @@
@Target({ElementType.PARAMETER })
public @interface HasAnnotation {
- Class value();
+ Class<?> value();
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/ObjectConverter.java Thu Nov 12 20:27:58 2009
@@ -21,8 +21,6 @@
import org.apache.camel.Converter;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Some core java.lang based <a
@@ -33,8 +31,6 @@
@Converter
public final class ObjectConverter {
- private static final transient Log LOG = LogFactory.getLog(ObjectConverter.class);
-
/**
* Utility classes should not have a public constructor.
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java Thu Nov 12 20:27:58 2009
@@ -32,7 +32,7 @@
protected static Map<String, AtomicInteger> nodeCounters = new HashMap<String, AtomicInteger>();
- public String createId(OptionalIdentifiedDefinition definition) {
+ public String createId(OptionalIdentifiedDefinition<?> definition) {
String key = definition.getShortName();
return key + getNodeCounter(key).incrementAndGet();
}
@@ -48,5 +48,4 @@
}
return answer;
}
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java Thu Nov 12 20:27:58 2009
@@ -54,5 +54,4 @@
public String toString() {
return "annotated with any @[" + annotations + "]";
}
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java Thu Nov 12 20:27:58 2009
@@ -38,13 +38,13 @@
this.parents.addAll(parents);
}
- public void addParentType(Class parentType) {
+ public void addParentType(Class<?> parentType) {
parents.add(parentType);
}
public boolean matches(Class type) {
if (parents != null && parents.size() > 0) {
- for (Class parent : parents) {
+ for (Class<?> parent : parents) {
if (parent.isAssignableFrom(type)) {
return true;
}
@@ -56,11 +56,10 @@
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- for (Class parent : parents) {
+ for (Class<?> parent : parents) {
sb.append(parent.getSimpleName()).append(", ");
}
sb.setLength(sb.length() > 0 ? sb.length() - 2 : 0);
return "is assignable to any of " + sb;
}
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java Thu Nov 12 20:27:58 2009
@@ -50,5 +50,4 @@
}
return true;
}
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java Thu Nov 12 20:27:58 2009
@@ -25,6 +25,8 @@
* @version $Revision$
*/
public class RuntimeBeanExpressionException extends RuntimeExpressionException {
+ private static final long serialVersionUID = -7184254079414493118L;
+
private final Exchange exchange;
private final String beanName;
private final String method;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Thu Nov 12 20:27:58 2009
@@ -157,7 +157,7 @@
* @param exceptions exception classes which we want to failover if one of them was thrown
* @return the builder
*/
- public LoadBalanceDefinition failover(Class... exceptions) {
+ public LoadBalanceDefinition failover(Class<?>... exceptions) {
loadBalancerType = new LoadBalancerDefinition(new FailOverLoadBalancer(Arrays.asList(exceptions)));
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java Thu Nov 12 20:27:58 2009
@@ -35,7 +35,7 @@
*/
@XmlType(name = "optionalIdentifiedDefinition")
@XmlAccessorType(XmlAccessType.FIELD)
-public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedDefinition> {
+public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedDefinition<?>> {
@XmlAttribute(required = false)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java Thu Nov 12 20:27:58 2009
@@ -38,9 +38,9 @@
@Override
protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
if (!exceptions.isEmpty()) {
- List<Class> classes = new ArrayList<Class>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
for (String name : exceptions) {
- Class type = routeContext.getCamelContext().getClassResolver().resolveClass(name);
+ Class<?> type = routeContext.getCamelContext().getClassResolver().resolveClass(name);
if (type == null) {
throw new IllegalArgumentException("Cannot find class: " + name + " in the classpath");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java Thu Nov 12 20:27:58 2009
@@ -27,22 +27,22 @@
*/
public class FailOverLoadBalancer extends LoadBalancerSupport {
- private final List<Class> exceptions;
+ private final List<Class<?>> exceptions;
public FailOverLoadBalancer() {
this.exceptions = null;
}
- public FailOverLoadBalancer(List<Class> exceptions) {
+ public FailOverLoadBalancer(List<Class<?>> exceptions) {
this.exceptions = exceptions;
- for (Class type : exceptions) {
+ for (Class<?> type : exceptions) {
if (!ObjectHelper.isAssignableFrom(Throwable.class, type)) {
throw new IllegalArgumentException("Class is not an instance of Throwable: " + type);
}
}
}
- public List<Class> getExceptions() {
+ public List<Class<?>> getExceptions() {
return exceptions;
}
@@ -60,7 +60,7 @@
return true;
}
- for (Class exception : exceptions) {
+ for (Class<?> exception : exceptions) {
// will look in exception hierarchy
if (exchange.getException(exception) != null) {
return true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/NoXmlBodyValidationException.java Thu Nov 12 20:27:58 2009
@@ -25,6 +25,7 @@
* @version $Revision$
*/
public class NoXmlBodyValidationException extends ValidationException {
+ private static final long serialVersionUID = 4502520681354358599L;
public NoXmlBodyValidationException(Exchange exchange) {
super(exchange, "No XML body could be found on the input message");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/validation/SchemaValidationException.java Thu Nov 12 20:27:58 2009
@@ -29,6 +29,8 @@
* @version $Revision$
*/
public class SchemaValidationException extends ValidationException {
+ private static final long serialVersionUID = 2656907296674888684L;
+
private final Object schema;
private final List<SAXParseException> fatalErrors;
private final List<SAXParseException> errors;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ClassResolver.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ClassResolver.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ClassResolver.java Thu Nov 12 20:27:58 2009
@@ -31,7 +31,7 @@
* @param name full qualified name of class
* @return the class if resolved, <tt>null</tt> if not found.
*/
- Class resolveClass(String name);
+ Class<?> resolveClass(String name);
/**
* Resolves the given class by its name
@@ -49,7 +49,7 @@
* @param loader use the provided class loader
* @return the class if resolved, <tt>null</tt> if not found.
*/
- Class resolveClass(String name, ClassLoader loader);
+ Class<?> resolveClass(String name, ClassLoader loader);
/**
* Resolves the given class by its name
@@ -68,7 +68,7 @@
* @return the class if resolved, <tt>null</tt> if not found.
* @throws ClassNotFoundException is thrown if class not found
*/
- Class resolveMandatoryClass(String name) throws ClassNotFoundException;
+ Class<?> resolveMandatoryClass(String name) throws ClassNotFoundException;
/**
* Resolves the given class by its name
@@ -88,7 +88,7 @@
* @return the class if resolved, <tt>null</tt> if not found.
* @throws ClassNotFoundException is thrown if class not found
*/
- Class resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException;
+ Class<?> resolveMandatoryClass(String name, ClassLoader loader) throws ClassNotFoundException;
/**
* Resolves the given class by its name
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/FactoryFinder.java Thu Nov 12 20:27:58 2009
@@ -64,7 +64,7 @@
* @throws ClassNotFoundException is thrown if class not found
* @throws java.io.IOException is thrown if loading the class or META-INF file not found
*/
- Class findClass(String key) throws ClassNotFoundException, IOException;
+ Class<?> findClass(String key) throws ClassNotFoundException, IOException;
/**
* Finds the given factory class using the the key to lookup.
@@ -75,5 +75,5 @@
* @throws ClassNotFoundException is thrown if not found
* @throws java.io.IOException is thrown if loading the class or META-INF file not found
*/
- Class findClass(String key, String propertyPrefix) throws ClassNotFoundException, IOException;
+ Class<?> findClass(String key, String propertyPrefix) throws ClassNotFoundException, IOException;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InterceptStrategy.java Thu Nov 12 20:27:58 2009
@@ -42,6 +42,6 @@
* @return processor wrapped with an interceptor or not wrapped
* @throws Exception can be thrown
*/
- Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition definition,
- Processor target, Processor nextTarget) throws Exception;
+ Processor wrapProcessorInInterceptors(CamelContext context,
+ ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementNamingStrategy.java Thu Nov 12 20:27:58 2009
@@ -45,7 +45,7 @@
ObjectName getObjectNameForErrorHandler(RouteContext routeContext, Processor errorHandler, ErrorHandlerBuilder builder) throws MalformedObjectNameException;
- ObjectName getObjectNameForProcessor(CamelContext context, Processor processor, ProcessorDefinition definition) throws MalformedObjectNameException;
+ ObjectName getObjectNameForProcessor(CamelContext context, Processor processor, ProcessorDefinition<?> definition) throws MalformedObjectNameException;
ObjectName getObjectNameForRoute(Route route) throws MalformedObjectNameException;
@@ -56,5 +56,4 @@
ObjectName getObjectNameForTracer(CamelContext context, InterceptStrategy tracer) throws MalformedObjectNameException;
ObjectName getObjectNameForService(CamelContext context, Service service) throws MalformedObjectNameException;
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java Thu Nov 12 20:27:58 2009
@@ -97,7 +97,7 @@
* @param definition definition of the processor
* @return <tt>true</tt> to manage it
*/
- boolean manageProcessor(ProcessorDefinition definition);
+ boolean manageProcessor(ProcessorDefinition<?> definition);
/**
* Sets the whether only manage processors if they have been configured with a custom id
@@ -130,5 +130,4 @@
* @return the level
*/
ManagementStatisticsLevel getStatisticsLevel();
-
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/NodeIdFactory.java Thu Nov 12 20:27:58 2009
@@ -31,5 +31,5 @@
* @param definition model definition
* @return the id created
*/
- String createId(OptionalIdentifiedDefinition definition);
+ String createId(OptionalIdentifiedDefinition<?> definition);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TraceableUnitOfWork.java Thu Nov 12 20:27:58 2009
@@ -63,6 +63,5 @@
* @param node the intercept node
* @return the current count
*/
- int getAndIncrement(ProcessorDefinition node);
-
+ int getAndIncrement(ProcessorDefinition<?> node);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java Thu Nov 12 20:27:58 2009
@@ -32,7 +32,7 @@
* @param fromType the type to convert from
* @param typeConverter the type converter to use
*/
- void addTypeConverter(Class toType, Class fromType, TypeConverter typeConverter);
+ void addTypeConverter(Class<?> toType, Class<?> fromType, TypeConverter typeConverter);
/**
* Registers a new fallback type converter
@@ -48,7 +48,7 @@
* @param fromType the type to convert from
* @return the type converter or null if not found.
*/
- TypeConverter lookup(Class toType, Class fromType);
+ TypeConverter lookup(Class<?> toType, Class<?> fromType);
/**
* Sets the injector to be used for creating new instances during type convertions.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CaseInsensitiveMap.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CaseInsensitiveMap.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CaseInsensitiveMap.java Thu Nov 12 20:27:58 2009
@@ -33,6 +33,7 @@
* @version $Revision$
*/
public class CaseInsensitiveMap extends HashMap<String, Object> {
+ private static final long serialVersionUID = -8538318195477618308L;
// holds a map of lower case key -> original key
private Map<String, String> originalKeys;
@@ -138,5 +139,4 @@
return entrySetView;
}
-
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CastUtils.java Thu Nov 12 20:27:58 2009
@@ -18,6 +18,7 @@
import java.util.Collection;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -25,6 +26,8 @@
import java.util.Set;
import java.util.concurrent.Future;
+import javax.naming.NamingEnumeration;
+
@SuppressWarnings("unchecked")
public final class CastUtils {
@@ -75,6 +78,13 @@
return (Queue<T>)p;
}
+ public static <T, U> Hashtable<T, U> cast(Hashtable<?, ?> p) {
+ return (Hashtable<T, U>)p;
+ }
+ public static <T, U> Hashtable<T, U> cast(Hashtable<?, ?> p, Class<T> pc, Class<U> uc) {
+ return (Hashtable<T, U>)p;
+ }
+
public static <T, U> Map.Entry<T, U> cast(Map.Entry<?, ?> p) {
return (Map.Entry<T, U>)p;
}
@@ -85,6 +95,9 @@
public static <T> Enumeration<T> cast(Enumeration<?> p) {
return (Enumeration<T>)p;
}
+ public static <T> NamingEnumeration<T> cast(NamingEnumeration<?> p) {
+ return (NamingEnumeration<T>)p;
+ }
public static <T> Class<T> cast(Class<?> p) {
return (Class<T>)p;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/CollectionHelper.java Thu Nov 12 20:27:58 2009
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -51,10 +50,10 @@
public static Integer size(Object value) {
if (value != null) {
if (value instanceof Collection) {
- Collection collection = (Collection)value;
+ Collection<?> collection = (Collection<?>)value;
return collection.size();
} else if (value instanceof Map) {
- Map map = (Map)value;
+ Map<?, ?> map = (Map<?, ?>)value;
return map.size();
} else if (value instanceof Object[]) {
Object[] array = (Object[])value;
@@ -111,15 +110,15 @@
return collectionAsCommaDelimitedString(Arrays.asList(col));
}
- public static String collectionAsCommaDelimitedString(Collection col) {
+ public static String collectionAsCommaDelimitedString(Collection<?> col) {
if (col == null || col.isEmpty()) {
return "";
}
StringBuilder sb = new StringBuilder();
- Iterator it = col.iterator();
+ Iterator<?> it = col.iterator();
while (it.hasNext()) {
- sb.append(it.next());
+ sb.append(it.next().toString());
if (it.hasNext()) {
sb.append(",");
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/DefaultTimeoutMap.java Thu Nov 12 20:27:58 2009
@@ -37,8 +37,8 @@
private static final transient Log LOG = LogFactory.getLog(DefaultTimeoutMap.class);
- private final Map map = new HashMap();
- private SortedSet index = new TreeSet();
+ private final Map<Object, Object> map = new HashMap<Object, Object>();
+ private SortedSet<TimeoutMapEntry> index = new TreeSet<TimeoutMapEntry>();
private ScheduledExecutorService executor;
private long purgePollTime;
@@ -52,7 +52,6 @@
schedulePoll();
}
- @SuppressWarnings("unchecked")
public Object get(Object key) {
TimeoutMapEntry entry = null;
synchronized (map) {
@@ -67,7 +66,6 @@
return entry.getValue();
}
- @SuppressWarnings("unchecked")
public void put(Object key, Object value, long timeoutMillis) {
TimeoutMapEntry entry = new TimeoutMapEntry(key, value, timeoutMillis);
synchronized (map) {
@@ -89,11 +87,10 @@
}
}
- @SuppressWarnings("unchecked")
public Object[] getKeys() {
Object[] keys = null;
synchronized (map) {
- Set keySet = map.keySet();
+ Set<Object> keySet = map.keySet();
keys = new Object[keySet.size()];
keySet.toArray(keys);
}
@@ -117,7 +114,7 @@
public void purge() {
long now = currentTime();
synchronized (map) {
- for (Iterator iter = index.iterator(); iter.hasNext();) {
+ for (Iterator<TimeoutMapEntry> iter = index.iterator(); iter.hasNext();) {
TimeoutMapEntry entry = (TimeoutMapEntry) iter.next();
if (entry == null) {
break;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java Thu Nov 12 20:27:58 2009
@@ -298,8 +298,8 @@
* @param exchange the exchange to make available
* @return a Map populated with the require variables
*/
- public static Map createVariableMap(Exchange exchange) {
- Map answer = new HashMap();
+ public static Map<String, Object> createVariableMap(Exchange exchange) {
+ Map<String, Object> answer = new HashMap<String, Object>();
populateVariableMap(exchange, answer);
return answer;
}
@@ -310,8 +310,7 @@
* @param exchange the exchange to make available
* @param map the map to populate
*/
- @SuppressWarnings("unchecked")
- public static void populateVariableMap(Exchange exchange, Map map) {
+ public static void populateVariableMap(Exchange exchange, Map<String, Object> map) {
map.put("exchange", exchange);
Message in = exchange.getIn();
map.put("in", in);
@@ -491,7 +490,7 @@
* @return the result body, can be <tt>null</tt>.
* @throws CamelExecutionException if the processing of the exchange failed
*/
- public static <T> T extractFutureBody(CamelContext context, Future future, Class<T> type) {
+ public static <T> T extractFutureBody(CamelContext context, Future<Object> future, Class<T> type) {
try {
return doExtractFutureBody(context, future.get(), type);
} catch (InterruptedException e) {
@@ -521,7 +520,7 @@
* @throws CamelExecutionException if the processing of the exchange failed
* @throws java.util.concurrent.TimeoutException is thrown if a timeout triggered
*/
- public static <T> T extractFutureBody(CamelContext context, Future future, long timeout, TimeUnit unit, Class<T> type) throws TimeoutException {
+ public static <T> T extractFutureBody(CamelContext context, Future<Object> future, long timeout, TimeUnit unit, Class<T> type) throws TimeoutException {
try {
if (timeout > 0) {
return doExtractFutureBody(context, future.get(timeout, unit), type);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java Thu Nov 12 20:27:58 2009
@@ -184,7 +184,7 @@
// build path based on stack
StringBuilder sb = new StringBuilder();
- for (Iterator it = stack.iterator(); it.hasNext();) {
+ for (Iterator<String> it = stack.iterator(); it.hasNext();) {
sb.append(it.next());
if (it.hasNext()) {
sb.append(File.separator);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java Thu Nov 12 20:27:58 2009
@@ -150,14 +150,13 @@
return type.getMethod("get" + ObjectHelper.capitalize(propertyName));
}
- @SuppressWarnings("unchecked")
- public static boolean setProperties(Object target, Map properties, String optionPrefix) throws Exception {
+ public static boolean setProperties(Object target, Map<String, Object> properties, String optionPrefix) throws Exception {
ObjectHelper.notNull(target, "target");
ObjectHelper.notNull(properties, "properties");
boolean rc = false;
- for (Iterator<Map.Entry> it = properties.entrySet().iterator(); it.hasNext();) {
- Map.Entry entry = it.next();
+ for (Iterator<Map.Entry<String, Object>> it = properties.entrySet().iterator(); it.hasNext();) {
+ Map.Entry<String, Object> entry = it.next();
String name = entry.getKey().toString();
if (name.startsWith(optionPrefix)) {
Object value = properties.get(name);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/KeyValueHolder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/KeyValueHolder.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/KeyValueHolder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/KeyValueHolder.java Thu Nov 12 20:27:58 2009
@@ -39,6 +39,7 @@
return value;
}
+ @SuppressWarnings("unchecked")
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -48,7 +49,7 @@
return false;
}
- KeyValueHolder that = (KeyValueHolder) o;
+ KeyValueHolder<K, V> that = (KeyValueHolder<K, V>) o;
if (key != null ? !key.equals(that.key) : that.key != null) {
return false;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUCache.java Thu Nov 12 20:27:58 2009
@@ -56,7 +56,7 @@
return maxCacheSize;
}
- protected boolean removeEldestEntry(Map.Entry entry) {
+ protected boolean removeEldestEntry(Map.Entry<K, V> entry) {
return size() > maxCacheSize;
}
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java Thu Nov 12 20:27:58 2009
@@ -48,7 +48,7 @@
}
service.start();
} else if (value instanceof Collection) {
- startServices((Collection)value);
+ startServices((Collection<?>)value);
}
}
@@ -64,7 +64,7 @@
/**
* Starts all of the given services
*/
- public static void startServices(Collection services) throws Exception {
+ public static void startServices(Collection<?> services) throws Exception {
for (Object value : services) {
if (value instanceof Service) {
Service service = (Service)value;
@@ -80,7 +80,7 @@
* Stops all of the given services, throwing the first exception caught
*/
public static void stopServices(Object... services) throws Exception {
- List list = Arrays.asList(services);
+ List<Object> list = Arrays.asList(services);
stopServices(list);
}
@@ -92,14 +92,14 @@
}
service.stop();
} else if (value instanceof Collection) {
- stopServices((Collection)value);
+ stopServices((Collection<?>)value);
}
}
/**
* Stops all of the given services, throwing the first exception caught
*/
- public static void stopServices(Collection services) throws Exception {
+ public static void stopServices(Collection<?> services) throws Exception {
Exception firstException = null;
for (Object value : services) {
if (value instanceof Service) {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/TimeoutMapEntry.java Thu Nov 12 20:27:58 2009
@@ -23,7 +23,7 @@
*
* @version $Revision$
*/
-public class TimeoutMapEntry implements Comparable, Map.Entry {
+public class TimeoutMapEntry implements Comparable<Object>, Map.Entry<Object, Object> {
private Object key;
private Object value;
private long timeout;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/SubmitOrderedCompletionService.java Thu Nov 12 20:27:58 2009
@@ -39,24 +39,24 @@
// the idea to order the completed task in the same order as they where submitted is to leverage
// the delay queue. With the delay queue we can control the order by the getDelay and compareTo methods
// where we can order the tasks in the same order as they where submitted.
- private final DelayQueue completionQueue = new DelayQueue();
+ private final DelayQueue<SubmitOrderFutureTask> completionQueue = new DelayQueue<SubmitOrderFutureTask>();
// id is the unique id that determines the order in which tasks was submitted (incrementing)
private final AtomicInteger id = new AtomicInteger();
// index is the index of the next id that should expire and thus be ready to take from the delayed queue
private final AtomicInteger index = new AtomicInteger();
- private class SubmitOrderFutureTask<V> extends FutureTask<Void> implements Delayed {
+ private class SubmitOrderFutureTask extends FutureTask<V> implements Delayed {
// the id this task was assigned
private final long id;
- public SubmitOrderFutureTask(long id, Callable<Void> voidCallable) {
+ public SubmitOrderFutureTask(long id, Callable<V> voidCallable) {
super(voidCallable);
this.id = id;
}
- public SubmitOrderFutureTask(long id, Runnable runnable, Void result) {
+ public SubmitOrderFutureTask(long id, Runnable runnable, V result) {
super(runnable, result);
this.id = id;
}
@@ -91,7 +91,7 @@
}
SubmitOrderFutureTask f = new SubmitOrderFutureTask(id.incrementAndGet(), task);
executor.execute(f);
- return f;
+ return (Future<V>) f;
}
@SuppressWarnings("unchecked")
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/CamelInitialContextFactory.java Thu Nov 12 20:27:58 2009
@@ -22,6 +22,8 @@
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
+import org.apache.camel.util.CastUtils;
+
/**
* A factory of the Camel InitialContext which allows a Map to be used to create a
* JNDI context.
@@ -37,9 +39,9 @@
* @return the created context.
* @throws NamingException is thrown if creation failed.
*/
- public Context getInitialContext(Hashtable environment) throws NamingException {
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
try {
- return new JndiContext(environment);
+ return new JndiContext(CastUtils.cast(environment, String.class, Object.class));
} catch (Exception e) {
if (e instanceof NamingException) {
throw (NamingException) e;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/jndi/JndiContext.java Thu Nov 12 20:27:58 2009
@@ -38,6 +38,7 @@
import javax.naming.spi.NamingManager;
import org.apache.camel.spi.Injector;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ReflectionInjector;
@@ -57,44 +58,38 @@
protected static final Injector INJETOR = new ReflectionInjector();
private static final long serialVersionUID = -5754338187296859149L;
- private final Hashtable environment; // environment for this context
- private final Map bindings; // bindings at my level
- private final Map treeBindings; // all bindings under me
+ private final Hashtable<String, Object> environment; // environment for this context
+ private final Map<String, Object> bindings; // bindings at my level
+ private final Map<String, Object> treeBindings; // all bindings under me
private boolean frozen;
private String nameInNamespace = "";
public JndiContext() throws Exception {
- this(new Hashtable());
+ this(new Hashtable<String, Object>());
}
- public JndiContext(Hashtable env) throws Exception {
+ public JndiContext(Hashtable<String, Object>env) throws Exception {
this(env, createBindingsMapFromEnvironment(env));
}
- @SuppressWarnings("unchecked")
- public JndiContext(Hashtable environment, Map bindings) {
- if (environment == null) {
- this.environment = new Hashtable();
- } else {
- this.environment = new Hashtable(environment);
- }
+ public JndiContext(Hashtable<String, Object> environment, Map<String, Object> bindings) {
+ this.environment = environment == null ? new Hashtable<String, Object>() : new Hashtable<String, Object>(environment);
this.bindings = bindings;
- treeBindings = new HashMap();
+ treeBindings = new HashMap<String, Object>();
}
- public JndiContext(Hashtable environment, Map bindings, String nameInNamespace) {
+ public JndiContext(Hashtable<String, Object> environment, Map<String, Object> bindings, String nameInNamespace) {
this(environment, bindings);
this.nameInNamespace = nameInNamespace;
}
- @SuppressWarnings("unchecked")
- protected JndiContext(JndiContext clone, Hashtable env) {
+ protected JndiContext(JndiContext clone, Hashtable<String, Object> env) {
this.bindings = clone.bindings;
this.treeBindings = clone.treeBindings;
- this.environment = new Hashtable(env);
+ this.environment = new Hashtable<String, Object>(env);
}
- protected JndiContext(JndiContext clone, Hashtable env, String nameInNamespace) {
+ protected JndiContext(JndiContext clone, Hashtable<String, Object> env, String nameInNamespace) {
this(clone, env);
this.nameInNamespace = nameInNamespace;
}
@@ -104,22 +99,19 @@
* properties using $foo.class to point to a class name with $foo.* being
* properties set on the injected bean
*/
- @SuppressWarnings("unchecked")
- public static Map createBindingsMapFromEnvironment(Hashtable env) throws Exception {
- Map answer = new HashMap(env);
+ public static Map<String, Object> createBindingsMapFromEnvironment(Hashtable<String, Object> env) throws Exception {
+ Map<String, Object> answer = new HashMap<String, Object>(env);
- for (Object object : env.entrySet()) {
- Map.Entry entry = (Map.Entry)object;
- Object key = entry.getKey();
+ for (Map.Entry<String, Object> entry : env.entrySet()) {
+ String key = entry.getKey();
Object value = entry.getValue();
- if (key instanceof String && value instanceof String) {
- String keyText = (String)key;
+ if (key != null && value instanceof String) {
String valueText = (String)value;
- if (keyText.endsWith(".class")) {
+ if (key.endsWith(".class")) {
Class<?> type = ObjectHelper.loadClass(valueText);
if (type != null) {
- String newEntry = keyText.substring(0, keyText.length() - ".class".length());
+ String newEntry = key.substring(0, key.length() - ".class".length());
Object bean = createBean(type, answer, newEntry + ".");
if (bean != null) {
answer.put(newEntry, bean);
@@ -150,12 +142,11 @@
* created it). (the names are suitably extended by the segment originally
* lopped off).
*/
- @SuppressWarnings("unchecked")
- protected Map internalBind(String name, Object value) throws NamingException {
+ protected Map<String, Object> internalBind(String name, Object value) throws NamingException {
assert name != null && name.length() > 0;
assert !frozen;
- Map newBindings = new HashMap();
+ Map<String, Object> newBindings = new HashMap<String, Object>();
int pos = name.indexOf('/');
if (pos == -1) {
if (treeBindings.put(name, value) != null) {
@@ -178,10 +169,10 @@
}
JndiContext defaultContext = (JndiContext)o;
String remainder = name.substring(pos + 1);
- Map subBindings = defaultContext.internalBind(remainder, value);
- for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry)iterator.next();
- String subName = segment + "/" + (String)entry.getKey();
+ Map<String, Object> subBindings = defaultContext.internalBind(remainder, value);
+ for (Iterator<Map.Entry<String, Object>> iterator = subBindings.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry<String, Object> entry = iterator.next();
+ String subName = segment + "/" + entry.getKey();
Object bound = entry.getValue();
treeBindings.put(subName, bound);
newBindings.put(subName, bound);
@@ -203,8 +194,8 @@
return environment.put(propName, propVal);
}
- public Hashtable getEnvironment() throws NamingException {
- return (Hashtable)environment.clone();
+ public Hashtable<String, Object> getEnvironment() throws NamingException {
+ return CastUtils.cast((Hashtable<?, ?>)environment.clone(), String.class, Object.class);
}
public Object removeFromEnvironment(String propName) throws NamingException {
@@ -291,10 +282,10 @@
return result.toString();
}
- public NamingEnumeration list(String name) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
Object o = lookup(name);
if (o == this) {
- return new ListEnumeration();
+ return CastUtils.cast(new ListEnumeration());
} else if (o instanceof Context) {
return ((Context)o).list("");
} else {
@@ -302,10 +293,10 @@
}
}
- public NamingEnumeration listBindings(String name) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
Object o = lookup(name);
if (o == this) {
- return new ListBindingEnumeration();
+ return CastUtils.cast(new ListBindingEnumeration());
} else if (o instanceof Context) {
return ((Context)o).listBindings("");
} else {
@@ -317,11 +308,11 @@
return lookupLink(name.toString());
}
- public NamingEnumeration list(Name name) throws NamingException {
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
return list(name.toString());
}
- public NamingEnumeration listBindings(Name name) throws NamingException {
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
return listBindings(name.toString());
}
@@ -394,8 +385,8 @@
treeBindings.remove(name);
}
- private abstract class LocalNamingEnumeration implements NamingEnumeration {
- private Iterator i = bindings.entrySet().iterator();
+ private abstract class LocalNamingEnumeration implements NamingEnumeration<Object> {
+ private Iterator<Map.Entry<String, Object>> i = bindings.entrySet().iterator();
public boolean hasMore() throws NamingException {
return i.hasNext();
@@ -405,8 +396,8 @@
return i.hasNext();
}
- protected Map.Entry getNext() {
- return (Map.Entry)i.next();
+ protected Map.Entry<String, Object> getNext() {
+ return i.next();
}
public void close() throws NamingException {
@@ -422,7 +413,7 @@
}
public Object nextElement() {
- Map.Entry entry = getNext();
+ Map.Entry<String, Object> entry = getNext();
return new NameClassPair((String)entry.getKey(), entry.getValue().getClass().getName());
}
}
@@ -436,12 +427,12 @@
}
public Object nextElement() {
- Map.Entry entry = getNext();
+ Map.Entry<String, Object> entry = getNext();
return new Binding((String)entry.getKey(), entry.getValue());
}
}
- protected static Object createBean(Class<?> type, Map properties, String prefix) throws Exception {
+ protected static Object createBean(Class<?> type, Map<String, Object> properties, String prefix) throws Exception {
Object value = INJETOR.newInstance(type);
IntrospectionSupport.setProperties(value, properties, prefix);
return value;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/CustomIdFactoryTest.java Thu Nov 12 20:27:58 2009
@@ -57,7 +57,7 @@
public void configure() throws Exception {
// use our own id factory so we can generate the keys we like to use
context.setNodeIdFactory(new NodeIdFactory() {
- public String createId(OptionalIdentifiedDefinition definition) {
+ public String createId(OptionalIdentifiedDefinition<?> definition) {
return "#" + definition.getShortName() + ++counter + "#";
}
});
@@ -107,8 +107,8 @@
private class MyDebuggerCheckingId implements InterceptStrategy {
- public Processor wrapProcessorInInterceptors(final CamelContext context, final ProcessorDefinition definition,
- Processor target, Processor nextTarget) throws Exception {
+ public Processor wrapProcessorInInterceptors(final CamelContext context,
+ final ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
// MUST DO THIS
// force id creation as sub nodes have lazy assigned ids
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java Thu Nov 12 20:27:58 2009
@@ -56,14 +56,12 @@
}
}
- @SuppressWarnings("unchecked")
private static class ExcludingPackageScanClassResolver extends DefaultPackageScanClassResolver {
public void setExcludedClasses(Set<Class> excludedClasses) {
excludedClasses = excludedClasses == null ? Collections.EMPTY_SET : excludedClasses;
addFilter(new InvertingPackageScanFilter(new AssignableToPackageScanFilter(excludedClasses)));
}
-
}
/**
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java?rev=835531&r1=835530&r2=835531&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java Thu Nov 12 20:27:58 2009
@@ -36,7 +36,7 @@
// Utility class, no public or protected default constructor
}
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
LoadBalanceDefinition loadB = (LoadBalanceDefinition)processor;
// buffer.append(".").append(output.getShortName()).append("()");
buffer.append(".").append("loadBalance").append("()");
@@ -44,8 +44,8 @@
LoadBalancer lb = loadB.getLoadBalancerType().getLoadBalancer(null);
if (lb instanceof FailOverLoadBalancer) {
buffer.append(".failover(");
- List<Class> exceptions = ((FailOverLoadBalancer)lb).getExceptions();
- for (Class excep : exceptions) {
+ List<Class<?>> exceptions = ((FailOverLoadBalancer)lb).getExceptions();
+ for (Class<?> excep : exceptions) {
buffer.append(excep.getSimpleName()).append(".class");
if (excep != exceptions.get(exceptions.size() - 1)) {
buffer.append(", ");
@@ -65,7 +65,7 @@
}
List<ProcessorDefinition> branches = loadB.getOutputs();
- for (ProcessorDefinition branch : branches) {
+ for (ProcessorDefinition<?> branch : branches) {
ProcessorDefinitionRenderer.render(buffer, branch);
}
}