You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/05/02 14:49:12 UTC
svn commit: r1333019 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/util/
components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/
components/camel-core-osgi/src/test/java/...
Author: bvahdat
Date: Wed May 2 12:49:11 2012
New Revision: 1333019
URL: http://svn.apache.org/viewvc?rev=1333019&view=rev
Log:
Made compiler a bit more happy with less warnings.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Wed May 2 12:49:11 2012
@@ -1119,7 +1119,7 @@ public final class ExpressionBuilder {
return new ExpressionAdapter() {
public Object evaluate(Exchange exchange) {
// evaluate expression as iterator
- Iterator it = expression.evaluate(exchange, Iterator.class);
+ Iterator<?> it = expression.evaluate(exchange, Iterator.class);
ObjectHelper.notNull(it, "expression: " + expression + " evaluated on " + exchange + " must return an java.util.Iterator");
return new GroupIterator(exchange.getContext(), it, token, group);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/GroupIterator.java Wed May 2 12:49:11 2012
@@ -35,10 +35,10 @@ import org.apache.camel.NoTypeConversion
* <p/>
* For example if you group by new line, then a new line token is inserted between the lines.
*/
-public final class GroupIterator implements Iterator, Closeable {
+public final class GroupIterator implements Iterator<Object>, Closeable {
private final CamelContext camelContext;
- private final Iterator it;
+ private final Iterator<?> it;
private final String token;
private final int group;
private boolean closed;
@@ -53,7 +53,7 @@ public final class GroupIterator impleme
* @param group number of parts to group together
* @throws IllegalArgumentException is thrown if group is not a positive number
*/
- public GroupIterator(CamelContext camelContext, Iterator it, String token, int group) {
+ public GroupIterator(CamelContext camelContext, Iterator<?> it, String token, int group) {
this.camelContext = camelContext;
this.it = it;
this.token = token;
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Wed May 2 12:49:11 2012
@@ -19,7 +19,6 @@ package org.apache.camel.dataformat.bind
import java.lang.reflect.Field;
import java.text.NumberFormat;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Modified: camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java (original)
+++ camel/trunk/components/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/CamelMockBundle.java Wed May 2 12:49:11 2012
@@ -103,7 +103,7 @@ public class CamelMockBundle extends Moc
}
@Override
- public Map getSignerCertificates(int signersType) {
+ public Map<?, ?> getSignerCertificates(int signersType) {
return null;
}
Modified: camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java (original)
+++ camel/trunk/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrConsumerTest.java Wed May 2 12:49:11 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.jcr;
import java.util.List;
import javax.jcr.Node;
import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
import javax.jcr.observation.Event;
import javax.jcr.observation.EventIterator;
Modified: camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java Wed May 2 12:49:11 2012
@@ -150,11 +150,11 @@ public final class CamelBlueprintHelper
Dictionary<?, ?> dic = bundleContext.getBundle().getHeaders();
System.err.println("Test bundle headers: " + explode(dic));
- for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
+ for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, null))) {
System.err.println("ServiceReference: " + ref);
}
- for (ServiceReference ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
+ for (ServiceReference<?> ref : asCollection(bundleContext.getAllServiceReferences(null, flt))) {
System.err.println("Filtered ServiceReference: " + ref);
}
@@ -187,8 +187,8 @@ public final class CamelBlueprintHelper
/**
* Provides an iterable collection of references, even if the original array is <code>null</code>.
*/
- private static Collection<ServiceReference> asCollection(ServiceReference[] references) {
- return references == null ? new ArrayList<ServiceReference>(0) : Arrays.asList(references);
+ private static Collection<ServiceReference<?>> asCollection(ServiceReference<?>[] references) {
+ return references == null ? new ArrayList<ServiceReference<?>>(0) : Arrays.asList(references);
}
private static TinyBundle createTestBundle(String name, String version, String descriptors) throws FileNotFoundException, MalformedURLException {
Modified: camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminTest.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminTest.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminTest.java Wed May 2 12:49:11 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.test.blueprint;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java?rev=1333019&r1=1333018&r2=1333019&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java Wed May 2 12:49:11 2012
@@ -25,7 +25,6 @@ import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.zookeeper.operations.GetChildrenOperation;
-import org.apache.camel.util.ExchangeHelper;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
@@ -142,7 +141,7 @@ public class ZookeeperProducerTest exten
exchange.getIn().setHeader(ZOOKEEPER_NODE, "/set-listing/firstborn");
exchange.setPattern(ExchangePattern.InOut);
template.send("zookeeper://localhost:39913/set-listing?create=true&listChildren=true", exchange);
- List<String> children = ExchangeHelper.getMandatoryOutBody(exchange, List.class);
+ List<?> children = exchange.getOut().getMandatoryBody(List.class);
assertEquals(1, children.size());
assertEquals("firstborn", children.get(0));
}