Author: dkulp
Date: Thu Jul 28 18:10:26 2011
New Revision: 1151950
URL: http://svn.apache.org/viewvc?rev=1151950&view=rev
Log:
Fix checkstyle errors and more compiler warnings
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IntrospectionSupport.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Thu Jul 28 18:10:26 2011
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.bean;
-import static org.apache.camel.util.ObjectHelper.asString;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
@@ -52,6 +51,8 @@ import org.apache.camel.util.StringHelpe
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.asString;
+
/**
* Information about a method to be used for invocation.
*
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Jul 28 18:10:26 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor;
-import static org.apache.camel.util.ObjectHelper.notNull;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -68,6 +66,9 @@ import org.apache.camel.util.concurrent.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
+
/**
* Implements the Multicast pattern to send a message exchange to a number of
* endpoints, each endpoint receiving a copy of the message exchange.
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=1151950&r1=1151949&r2=1151950&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 Jul 28 18:10:26 2011
@@ -444,7 +444,4 @@ public final class IntrospectionSupport
}
}
- private static Set<Method> findSetterMethods(TypeConverter typeConverter,
Class<?> clazz, String name, Object value) {
- return findSetterMethods(typeConverter, clazz, name, value, false);
- }
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java
Thu Jul 28 18:10:26 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.jms;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -44,6 +42,9 @@ import org.apache.camel.test.junit4.Came
import org.junit.Before;
import org.junit.Test;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+
/**
* @version
*/
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
(original)
+++
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DotMojo.java
Thu Jul 28 18:10:26 2011
@@ -462,10 +462,10 @@ public class DotMojo extends AbstractMav
String generatedFileName = removeFileExtension(file.getAbsolutePath())
+ "." + format;
Commandline cl = new Commandline();
cl.setExecutable(executable);
- cl.createArgument().setValue("-T" + format);
- cl.createArgument().setValue("-o");
- cl.createArgument().setValue(generatedFileName);
- cl.createArgument().setValue(file.getAbsolutePath());
+ cl.createArg().setValue("-T" + format);
+ cl.createArg().setValue("-o");
+ cl.createArg().setValue(generatedFileName);
+ cl.createArg().setValue(file.getAbsolutePath());
log.debug("executing: " + cl.toString());
@@ -488,7 +488,7 @@ public class DotMojo extends AbstractMav
private int dotHelpExitCode() throws CommandLineException {
Commandline cl = new Commandline();
cl.setExecutable(executable);
- cl.createArgument().setValue("-?");
+ cl.createArg().setValue("-?");
CommandLineUtils.StringStreamConsumer stdout = new
CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer stderr = new
CommandLineUtils.StringStreamConsumer();
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
(original)
+++
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
Thu Jul 28 18:10:26 2011
@@ -262,7 +262,7 @@ public class EmbeddedMojo extends Abstra
for (int i = 0; i < size; i++) {
String name = (String) classpathElements.get(i);
File file = new File(name);
- urls[i] = file.toURL();
+ urls[i] = file.toURI().toURL();
getLog().debug("URL: " + urls[i]);
}
URLClassLoader loader = new URLClassLoader(urls, parent);
Modified:
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
(original)
+++
camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Thu Jul 28 18:10:26 2011
@@ -642,7 +642,7 @@ public class RunMojo extends AbstractExe
Artifact classPathElement = (Artifact)iter.next();
getLog().debug("Adding plugin dependency artifact: " +
classPathElement.getArtifactId()
+ " to classpath");
- path.add(classPathElement.getFile().toURL());
+ path.add(classPathElement.getFile().toURI().toURL());
}
} catch (MalformedURLException e) {
throw new MojoExecutionException("Error during setting up
classpath", e);
@@ -662,7 +662,7 @@ public class RunMojo extends AbstractExe
try {
getLog().debug("Project Dependencies will be included.");
- URL mainClasses = new
File(project.getBuild().getOutputDirectory()).toURL();
+ URL mainClasses = new
File(project.getBuild().getOutputDirectory()).toURI().toURL();
getLog().debug("Adding to classpath : " + mainClasses);
path.add(mainClasses);
@@ -679,7 +679,7 @@ public class RunMojo extends AbstractExe
+ " to classpath");
File file = classPathElement.getFile();
if (file != null) {
- path.add(file.toURL());
+ path.add(file.toURI().toURL());
}
}
@@ -735,7 +735,7 @@ public class RunMojo extends AbstractExe
}
Artifact art =
this.artifactFactory.createDependencyArtifact(groupId, artifactId, versionRange,
- type,
classifier, scope, optional);
+ type,
classifier, scope, null, optional);
if (scope.equalsIgnoreCase(Artifact.SCOPE_SYSTEM)) {
art.setFile(new File(dependency.getSystemPath()));
Modified:
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
(original)
+++
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/DotMojo.java
Thu Jul 28 18:10:26 2011
@@ -435,10 +435,10 @@ public class DotMojo extends AbstractMav
String generatedFileName = removeFileExtension(file.getAbsolutePath())
+ "." + format;
Commandline cl = new Commandline();
cl.setExecutable(executable);
- cl.createArgument().setValue("-T" + format);
- cl.createArgument().setValue("-o");
- cl.createArgument().setValue(generatedFileName);
- cl.createArgument().setValue(file.getAbsolutePath());
+ cl.createArg().setValue("-T" + format);
+ cl.createArg().setValue("-o");
+ cl.createArg().setValue(generatedFileName);
+ cl.createArg().setValue(file.getAbsolutePath());
log.debug("executing: " + cl.toString());
Modified:
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
(original)
+++
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/EmbeddedMojo.java
Thu Jul 28 18:10:26 2011
@@ -223,7 +223,7 @@ public class EmbeddedMojo extends Abstra
for (int i = 0; i < size; i++) {
String name = (String) classpathElements.get(i);
File file = new File(name);
- urls[i] = file.toURL();
+ urls[i] = file.toURI().toURL();
getLog().debug("URL: " + urls[i]);
}
URLClassLoader loader = new URLClassLoader(urls, parent);
Modified:
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java?rev=1151950&r1=1151949&r2=1151950&view=diff
==============================================================================
---
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
(original)
+++
camel/trunk/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java
Thu Jul 28 18:10:26 2011
@@ -596,7 +596,7 @@ public class RunMojo extends AbstractExe
Artifact classPathElement = (Artifact)iter.next();
getLog().debug("Adding plugin dependency artifact: " +
classPathElement.getArtifactId()
+ " to classpath");
- path.add(classPathElement.getFile().toURL());
+ path.add(classPathElement.getFile().toURI().toURL());
}
} catch (MalformedURLException e) {
throw new MojoExecutionException("Error during setting up
classpath", e);
@@ -616,7 +616,7 @@ public class RunMojo extends AbstractExe
try {
getLog().debug("Project Dependencies will be included.");
- URL mainClasses = new
File(project.getBuild().getOutputDirectory()).toURL();
+ URL mainClasses = new
File(project.getBuild().getOutputDirectory()).toURI().toURL();
getLog().debug("Adding to classpath : " + mainClasses);
path.add(mainClasses);
@@ -633,7 +633,7 @@ public class RunMojo extends AbstractExe
+ " to classpath");
File file = classPathElement.getFile();
if (file != null) {
- path.add(file.toURL());
+ path.add(file.toURI().toURL());
}
}
@@ -689,7 +689,7 @@ public class RunMojo extends AbstractExe
}
Artifact art =
this.artifactFactory.createDependencyArtifact(groupId, artifactId, versionRange,
- type,
classifier, scope, optional);
+ type,
classifier, scope, null, optional);
if (scope.equalsIgnoreCase(Artifact.SCOPE_SYSTEM)) {
art.setFile(new File(dependency.getSystemPath()));
