This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-exec.git
The following commit(s) were added to refs/heads/master by this push:
new 461d834 Javadoc @link tags do not need to use a FQCN for classes in
java.lang
461d834 is described below
commit 461d8342828a41bbcc117078fd2af1cd48282d0d
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Aug 29 07:36:11 2022 -0400
Javadoc @link tags do not need to use a FQCN for classes in java.lang
---
.../java/org/apache/commons/exec/Executor.java | 418 ++++++++++-----------
.../org/apache/commons/exec/ProcessDestroyer.java | 122 +++---
2 files changed, 270 insertions(+), 270 deletions(-)
diff --git a/src/main/java/org/apache/commons/exec/Executor.java
b/src/main/java/org/apache/commons/exec/Executor.java
index 80478a5..40a7cbd 100644
--- a/src/main/java/org/apache/commons/exec/Executor.java
+++ b/src/main/java/org/apache/commons/exec/Executor.java
@@ -1,209 +1,209 @@
-/*
- * 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
- *
- * 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.
- *
- */
-
-package org.apache.commons.exec;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * The main abstraction to start an external process.
- *
- * The interface allows to
- * <ul>
- * <li>set a current working directory for the subprocess</li>
- * <li>provide a set of environment variables passed to the subprocess</li>
- * <li>capture the subprocess output of stdout and stderr using an
ExecuteStreamHandler</li>
- * <li>kill long-running processes using an ExecuteWatchdog</li>
- * <li>define a set of expected exit values</li>
- * <li>terminate any started processes when the main process is terminating
using a ProcessDestroyer</li>
- * </ul>
- *
- * The following example shows the basic usage:
- *
- * <pre>
- * Executor exec = new DefaultExecutor();
- * CommandLine cl = new CommandLine("ls -l");
- * int exitvalue = exec.execute(cl);
- * </pre>
- *
- */
-
-public interface Executor {
-
- /** Invalid exit code. */
- int INVALID_EXITVALUE = 0xdeadbeef;
-
- /**
- * Define the {@code exitValue} of the process to be considered
- * successful. If a different exit value is returned by
- * the process then {@link
org.apache.commons.exec.Executor#execute(CommandLine)}
- * will throw an {@link org.apache.commons.exec.ExecuteException}
- *
- * @param value the exit code representing successful execution
- */
- void setExitValue(final int value);
-
- /**
- * Define a list of {@code exitValue} of the process to be considered
- * successful. The caller can pass one of the following values
- * <ul>
- * <li>an array of exit values to be considered successful</li>
- * <li>an empty array for auto-detect of successful exit codes relying on
{@link org.apache.commons.exec.Executor#isFailure(int)}</li>
- * <li>null to indicate to skip checking of exit codes</li>
- * </ul>
- *
- * If an undefined exit value is returned by the process then
- * {@link org.apache.commons.exec.Executor#execute(CommandLine)} will
- * throw an {@link org.apache.commons.exec.ExecuteException}.
- *
- * @param values a list of the exit codes
- */
- void setExitValues(final int[] values);
-
- /**
- * Checks whether {@code exitValue} signals a failure. If no
- * exit values are set than the default conventions of the OS is
- * used. e.g. most OS regard an exit code of '0' as successful
- * execution and everything else as failure.
- *
- * @param exitValue the exit value (return code) to be checked
- * @return {@code true} if {@code exitValue} signals a failure
- */
- boolean isFailure(final int exitValue);
-
- /**
- * Get the StreamHandler used for providing input and
- * retrieving the output.
- *
- * @return the StreamHandler
- */
- ExecuteStreamHandler getStreamHandler();
-
- /**
- * Set a custom the StreamHandler used for providing
- * input and retrieving the output. If you don't provide
- * a proper stream handler the executed process might block
- * when writing to stdout and/or stderr (see
- * {@link java.lang.Process Process}).
- *
- * @param streamHandler the stream handler
- */
- void setStreamHandler(ExecuteStreamHandler streamHandler);
-
- /**
- * Get the watchdog used to kill of processes running,
- * typically, too long time.
- *
- * @return the watchdog
- */
- ExecuteWatchdog getWatchdog();
-
- /**
- * Set the watchdog used to kill of processes running,
- * typically, too long time.
- *
- * @param watchDog the watchdog
- */
- void setWatchdog(ExecuteWatchdog watchDog);
-
- /**
- * Set the handler for cleanup of started processes if the main process
- * is going to terminate.
- *
- * @return the ProcessDestroyer
- */
- ProcessDestroyer getProcessDestroyer();
-
- /**
- * Get the handler for cleanup of started processes if the main process
- * is going to terminate.
- *
- * @param processDestroyer the ProcessDestroyer
- */
- void setProcessDestroyer(ProcessDestroyer processDestroyer);
-
- /**
- * Get the working directory of the created process.
- *
- * @return the working directory
- */
- File getWorkingDirectory();
-
- /**
- * Set the working directory of the created process. The
- * working directory must exist when you start the process.
- *
- * @param dir the working directory
- */
- void setWorkingDirectory(File dir);
-
- /**
- * Methods for starting synchronous execution. The child process inherits
- * all environment variables of the parent process.
- *
- * @param command the command to execute
- * @return process exit value
- * @throws ExecuteException execution of subprocess failed or the
- * subprocess returned a exit value indicating a failure
- * {@link Executor#setExitValue(int)}.
- */
- int execute(CommandLine command)
- throws ExecuteException, IOException;
-
- /**
- * Methods for starting synchronous execution.
- *
- * @param command the command to execute
- * @param environment The environment for the new process. If null, the
- * environment of the current process is used.
- * @return process exit value
- * @throws ExecuteException execution of subprocess failed or the
- * subprocess returned a exit value indicating a failure
- * {@link Executor#setExitValue(int)}.
- */
- int execute(CommandLine command, Map<String, String> environment)
- throws ExecuteException, IOException;
-
- /**
- * Methods for starting asynchronous execution. The child process inherits
- * all environment variables of the parent process. Result provided to
- * callback handler.
- *
- * @param command the command to execute
- * @param handler capture process termination and exit code
- * @throws ExecuteException execution of subprocess failed
- */
- void execute(CommandLine command, ExecuteResultHandler handler)
- throws ExecuteException, IOException;
-
- /**
- * Methods for starting asynchronous execution. The child process inherits
- * all environment variables of the parent process. Result provided to
- * callback handler.
- *
- * @param command the command to execute
- * @param environment The environment for the new process. If null, the
- * environment of the current process is used.
- * @param handler capture process termination and exit code
- * @throws ExecuteException execution of subprocess failed
- */
- void execute(CommandLine command, Map<String, String> environment,
ExecuteResultHandler handler)
- throws ExecuteException, IOException;
-}
+/*
+ * 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
+ *
+ * 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.
+ *
+ */
+
+package org.apache.commons.exec;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * The main abstraction to start an external process.
+ *
+ * The interface allows to
+ * <ul>
+ * <li>set a current working directory for the subprocess</li>
+ * <li>provide a set of environment variables passed to the subprocess</li>
+ * <li>capture the subprocess output of stdout and stderr using an
ExecuteStreamHandler</li>
+ * <li>kill long-running processes using an ExecuteWatchdog</li>
+ * <li>define a set of expected exit values</li>
+ * <li>terminate any started processes when the main process is terminating
using a ProcessDestroyer</li>
+ * </ul>
+ *
+ * The following example shows the basic usage:
+ *
+ * <pre>
+ * Executor exec = new DefaultExecutor();
+ * CommandLine cl = new CommandLine("ls -l");
+ * int exitvalue = exec.execute(cl);
+ * </pre>
+ *
+ */
+
+public interface Executor {
+
+ /** Invalid exit code. */
+ int INVALID_EXITVALUE = 0xdeadbeef;
+
+ /**
+ * Define the {@code exitValue} of the process to be considered
+ * successful. If a different exit value is returned by
+ * the process then {@link
org.apache.commons.exec.Executor#execute(CommandLine)}
+ * will throw an {@link org.apache.commons.exec.ExecuteException}
+ *
+ * @param value the exit code representing successful execution
+ */
+ void setExitValue(final int value);
+
+ /**
+ * Define a list of {@code exitValue} of the process to be considered
+ * successful. The caller can pass one of the following values
+ * <ul>
+ * <li>an array of exit values to be considered successful</li>
+ * <li>an empty array for auto-detect of successful exit codes relying on
{@link org.apache.commons.exec.Executor#isFailure(int)}</li>
+ * <li>null to indicate to skip checking of exit codes</li>
+ * </ul>
+ *
+ * If an undefined exit value is returned by the process then
+ * {@link org.apache.commons.exec.Executor#execute(CommandLine)} will
+ * throw an {@link org.apache.commons.exec.ExecuteException}.
+ *
+ * @param values a list of the exit codes
+ */
+ void setExitValues(final int[] values);
+
+ /**
+ * Checks whether {@code exitValue} signals a failure. If no
+ * exit values are set than the default conventions of the OS is
+ * used. e.g. most OS regard an exit code of '0' as successful
+ * execution and everything else as failure.
+ *
+ * @param exitValue the exit value (return code) to be checked
+ * @return {@code true} if {@code exitValue} signals a failure
+ */
+ boolean isFailure(final int exitValue);
+
+ /**
+ * Get the StreamHandler used for providing input and
+ * retrieving the output.
+ *
+ * @return the StreamHandler
+ */
+ ExecuteStreamHandler getStreamHandler();
+
+ /**
+ * Set a custom the StreamHandler used for providing
+ * input and retrieving the output. If you don't provide
+ * a proper stream handler the executed process might block
+ * when writing to stdout and/or stderr (see
+ * {@link Process Process}).
+ *
+ * @param streamHandler the stream handler
+ */
+ void setStreamHandler(ExecuteStreamHandler streamHandler);
+
+ /**
+ * Get the watchdog used to kill of processes running,
+ * typically, too long time.
+ *
+ * @return the watchdog
+ */
+ ExecuteWatchdog getWatchdog();
+
+ /**
+ * Set the watchdog used to kill of processes running,
+ * typically, too long time.
+ *
+ * @param watchDog the watchdog
+ */
+ void setWatchdog(ExecuteWatchdog watchDog);
+
+ /**
+ * Set the handler for cleanup of started processes if the main process
+ * is going to terminate.
+ *
+ * @return the ProcessDestroyer
+ */
+ ProcessDestroyer getProcessDestroyer();
+
+ /**
+ * Get the handler for cleanup of started processes if the main process
+ * is going to terminate.
+ *
+ * @param processDestroyer the ProcessDestroyer
+ */
+ void setProcessDestroyer(ProcessDestroyer processDestroyer);
+
+ /**
+ * Get the working directory of the created process.
+ *
+ * @return the working directory
+ */
+ File getWorkingDirectory();
+
+ /**
+ * Set the working directory of the created process. The
+ * working directory must exist when you start the process.
+ *
+ * @param dir the working directory
+ */
+ void setWorkingDirectory(File dir);
+
+ /**
+ * Methods for starting synchronous execution. The child process inherits
+ * all environment variables of the parent process.
+ *
+ * @param command the command to execute
+ * @return process exit value
+ * @throws ExecuteException execution of subprocess failed or the
+ * subprocess returned a exit value indicating a failure
+ * {@link Executor#setExitValue(int)}.
+ */
+ int execute(CommandLine command)
+ throws ExecuteException, IOException;
+
+ /**
+ * Methods for starting synchronous execution.
+ *
+ * @param command the command to execute
+ * @param environment The environment for the new process. If null, the
+ * environment of the current process is used.
+ * @return process exit value
+ * @throws ExecuteException execution of subprocess failed or the
+ * subprocess returned a exit value indicating a failure
+ * {@link Executor#setExitValue(int)}.
+ */
+ int execute(CommandLine command, Map<String, String> environment)
+ throws ExecuteException, IOException;
+
+ /**
+ * Methods for starting asynchronous execution. The child process inherits
+ * all environment variables of the parent process. Result provided to
+ * callback handler.
+ *
+ * @param command the command to execute
+ * @param handler capture process termination and exit code
+ * @throws ExecuteException execution of subprocess failed
+ */
+ void execute(CommandLine command, ExecuteResultHandler handler)
+ throws ExecuteException, IOException;
+
+ /**
+ * Methods for starting asynchronous execution. The child process inherits
+ * all environment variables of the parent process. Result provided to
+ * callback handler.
+ *
+ * @param command the command to execute
+ * @param environment The environment for the new process. If null, the
+ * environment of the current process is used.
+ * @param handler capture process termination and exit code
+ * @throws ExecuteException execution of subprocess failed
+ */
+ void execute(CommandLine command, Map<String, String> environment,
ExecuteResultHandler handler)
+ throws ExecuteException, IOException;
+}
diff --git a/src/main/java/org/apache/commons/exec/ProcessDestroyer.java
b/src/main/java/org/apache/commons/exec/ProcessDestroyer.java
index db1eee8..51b4495 100644
--- a/src/main/java/org/apache/commons/exec/ProcessDestroyer.java
+++ b/src/main/java/org/apache/commons/exec/ProcessDestroyer.java
@@ -1,61 +1,61 @@
-/*
- * 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
- *
- * 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.
- *
- */
-
-package org.apache.commons.exec;
-
-/**
- * Destroys all registered {@link java.lang.Process} after a certain event,
- * typically when the VM exits
- * @see org.apache.commons.exec.ShutdownHookProcessDestroyer
- *
- */
-public interface ProcessDestroyer {
-
- /**
- * Returns {@code true} if the specified
- * {@link java.lang.Process} was
- * successfully added to the list of processes to be destroy.
- *
- * @param process
- * the process to add
- * @return {@code true} if the specified
- * {@link java.lang.Process} was
- * successfully added
- */
- boolean add(Process process);
-
- /**
- * Returns {@code true} if the specified
- * {@link java.lang.Process} was
- * successfully removed from the list of processes to be destroy.
- *
- * @param process
- * the process to remove
- * @return {@code true} if the specified
- * {@link java.lang.Process} was
- * successfully removed
- */
- boolean remove(Process process);
-
- /**
- * Returns the number of registered processes.
- *
- * @return the number of register process
- */
- int size();
-}
+/*
+ * 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
+ *
+ * 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.
+ *
+ */
+
+package org.apache.commons.exec;
+
+/**
+ * Destroys all registered {@link java.lang.Process} after a certain event,
+ * typically when the VM exits
+ * @see org.apache.commons.exec.ShutdownHookProcessDestroyer
+ *
+ */
+public interface ProcessDestroyer {
+
+ /**
+ * Returns {@code true} if the specified
+ * {@link Process} was
+ * successfully added to the list of processes to be destroy.
+ *
+ * @param process
+ * the process to add
+ * @return {@code true} if the specified
+ * {@link java.lang.Process} was
+ * successfully added
+ */
+ boolean add(Process process);
+
+ /**
+ * Returns {@code true} if the specified
+ * {@link Process} was
+ * successfully removed from the list of processes to be destroy.
+ *
+ * @param process
+ * the process to remove
+ * @return {@code true} if the specified
+ * {@link java.lang.Process} was
+ * successfully removed
+ */
+ boolean remove(Process process);
+
+ /**
+ * Returns the number of registered processes.
+ *
+ * @return the number of register process
+ */
+ int size();
+}
