CAMEL-9225: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67825200 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67825200 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67825200 Branch: refs/heads/master Commit: 678252004165755c64bfca78f150718538f994df Parents: 534b4a8 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Oct 27 09:37:53 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Oct 27 09:37:53 2015 +0100 ---------------------------------------------------------------------- .../camel/component/exec/ExecException.java | 6 ++--- .../exec/impl/DefaultExecCommandExecutor.java | 20 +++++++-------- .../component/exec/ExecJavaProcessTest.java | 26 +++++++++----------- .../ProvokeExceptionExecCommandExecutor.java | 15 +++++------ 4 files changed, 33 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/67825200/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecException.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecException.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecException.java index afc762a..ff05b92 100644 --- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecException.java +++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecException.java @@ -23,13 +23,13 @@ import org.apache.camel.RuntimeCamelException; * Exception thrown when there is an execution failure. */ public class ExecException extends RuntimeCamelException { - + + private static final long serialVersionUID = 7808703605527644487L; + private final int exitValue; private final InputStream stdout; private final InputStream stderr; - private static final long serialVersionUID = 7808703605527644487L; - public ExecException(String message, final InputStream stdout, final InputStream stderr, final int exitValue) { super(message); this.exitValue = exitValue; http://git-wip-us.apache.org/repos/asf/camel/blob/67825200/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java index 3cbce5b..9e6d549e 100644 --- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java +++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java @@ -1,18 +1,18 @@ /** * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.exec.impl; http://git-wip-us.apache.org/repos/asf/camel/blob/67825200/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java index 224f38a..af1339d 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java @@ -1,18 +1,18 @@ /** * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.camel.component.exec; @@ -27,8 +27,10 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.exec.impl.ProvokeExceptionExecCommandExecutor; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; +import org.apache.camel.impl.JndiRegistry; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.commons.io.IOUtils; import org.junit.Test; @@ -50,11 +52,7 @@ import static org.apache.camel.component.exec.ExecutableJavaProgram.PRINT_IN_STD import static org.apache.camel.component.exec.ExecutableJavaProgram.READ_INPUT_LINES_AND_PRINT_THEM; import static org.apache.camel.component.exec.ExecutableJavaProgram.SLEEP_WITH_TIMEOUT; import static org.apache.camel.component.exec.ExecutableJavaProgram.THREADS; -import org.apache.camel.component.exec.impl.ProvokeExceptionExecCommandExecutor; -import org.apache.camel.impl.JndiRegistry; import static org.apache.commons.io.IOUtils.LINE_SEPARATOR; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; /** * Tests the functionality of the {@link ExecComponent}, executing<br> http://git-wip-us.apache.org/repos/asf/camel/blob/67825200/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ProvokeExceptionExecCommandExecutor.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ProvokeExceptionExecCommandExecutor.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ProvokeExceptionExecCommandExecutor.java index 8bdeb08..d36fa57 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ProvokeExceptionExecCommandExecutor.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/impl/ProvokeExceptionExecCommandExecutor.java @@ -1,9 +1,10 @@ -/* - * Copyright 2015 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -21,7 +22,7 @@ import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.ShutdownHookProcessDestroyer; /** - * Mock of {@link ExecCommandExecutor} which provokes to throw an + * Mock of {@link org.apache.camel.component.exec.ExecCommandExecutor} which provokes to throw an * {@link org.apache.camel.component.exec.ExecException} */ public class ProvokeExceptionExecCommandExecutor extends DefaultExecCommandExecutor {
