You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rm...@apache.org on 2015/11/30 12:02:50 UTC
incubator-batchee git commit: adding CliConfiguration for batchee cli,
simpler customization of the cli
Repository: incubator-batchee
Updated Branches:
refs/heads/master 68bbcb961 -> 8750f4bee
adding CliConfiguration for batchee cli, simpler customization of the cli
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/8750f4be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/8750f4be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/8750f4be
Branch: refs/heads/master
Commit: 8750f4bee017f60045bf0e51b2c5c9c1705852a0
Parents: 68bbcb9
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Mon Nov 30 12:03:19 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Mon Nov 30 12:03:19 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/batchee/cli/BatchEECLI.java | 104 +++++++++++++------
.../batchee/cli/command/CliConfiguration.java | 26 +++++
2 files changed, 96 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/8750f4be/tools/cli/src/main/java/org/apache/batchee/cli/BatchEECLI.java
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/java/org/apache/batchee/cli/BatchEECLI.java b/tools/cli/src/main/java/org/apache/batchee/cli/BatchEECLI.java
index d184d6c..a749fc9 100644
--- a/tools/cli/src/main/java/org/apache/batchee/cli/BatchEECLI.java
+++ b/tools/cli/src/main/java/org/apache/batchee/cli/BatchEECLI.java
@@ -20,6 +20,7 @@ import io.airlift.airline.Cli;
import io.airlift.airline.Help;
import io.airlift.airline.ParseException;
import org.apache.batchee.cli.command.Abandon;
+import org.apache.batchee.cli.command.CliConfiguration;
import org.apache.batchee.cli.command.Executions;
import org.apache.batchee.cli.command.Exit;
import org.apache.batchee.cli.command.Instances;
@@ -29,56 +30,91 @@ import org.apache.batchee.cli.command.Running;
import org.apache.batchee.cli.command.Start;
import org.apache.batchee.cli.command.Status;
import org.apache.batchee.cli.command.Stop;
+import org.apache.batchee.cli.command.UserCommand;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.ServiceLoader;
import static java.lang.ClassLoader.getSystemClassLoader;
public class BatchEECLI {
public static void main(final String[] args) {
- final Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("batchee")
- .withDescription("BatchEE CLI")
- .withDefaultCommand(Help.class)
- .withCommands(Help.class,
- Names.class,
- Start.class, Restart.class,
- Status.class, Running.class,
- Stop.class, Abandon.class,
- Instances.class, Executions.class);
+ final Iterator<CliConfiguration> configuration = ServiceLoader.load(CliConfiguration.class).iterator();
+ final CliConfiguration cliConfiguration = configuration.hasNext() ? configuration.next() : new CliConfiguration() {
+ @Override
+ public String name() {
+ return "batchee";
+ }
+
+ @Override
+ public String description() {
+ return "BatchEE CLI";
+ }
+
+ @Override
+ public boolean addDefaultCommands() {
+ return true;
+ }
- // user extension point
- try { // read manually cause we dont want to instantiate them there, so no ServiceLoader
- final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- final ClassLoader loader = tccl != null ? tccl : getSystemClassLoader();
- final Enumeration<URL> uc = loader.getResources("META-INF/services/org.apache.batchee.cli.command.UserCommand");
- while (uc.hasMoreElements()) {
- final URL url = uc.nextElement();
- BufferedReader r = null;
- try {
- r = new BufferedReader(new InputStreamReader(url.openStream()));
- String line;
- while ((line = r.readLine()) != null) {
- if (line.startsWith("#") || line.trim().isEmpty()) {
- continue;
+ @Override
+ public Iterator<Class<? extends UserCommand>> userCommands() {
+ final Collection<Class<? extends UserCommand>> classes = new ArrayList<Class<? extends UserCommand>>();
+ try { // read manually cause we dont want to instantiate them there, so no ServiceLoader
+ final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ final ClassLoader loader = tccl != null ? tccl : getSystemClassLoader();
+ final Enumeration<URL> uc = loader.getResources("META-INF/services/org.apache.batchee.cli.command.UserCommand");
+ while (uc.hasMoreElements()) {
+ final URL url = uc.nextElement();
+ BufferedReader r = null;
+ try {
+ r = new BufferedReader(new InputStreamReader(url.openStream()));
+ String line;
+ while ((line = r.readLine()) != null) {
+ if (line.startsWith("#") || line.trim().isEmpty()) {
+ continue;
+ }
+ classes.add(Class.class.cast(loader.loadClass(line.trim())));
+ }
+ } catch (final IOException ioe) {
+ throw new IllegalStateException(ioe);
+ } catch (final ClassNotFoundException cnfe) {
+ throw new IllegalArgumentException(cnfe);
+ } finally {
+ if (r != null) {
+ r.close();
+ }
}
- builder.withCommand(Class.class.cast(loader.loadClass(line.trim())));
- }
- } catch (final IOException ioe) {
- throw new IllegalStateException(ioe);
- } catch (final ClassNotFoundException cnfe) {
- throw new IllegalArgumentException(cnfe);
- } finally {
- if (r != null) {
- r.close();
}
+ } catch (final IOException e) {
+ throw new IllegalStateException(e);
}
+ return classes.iterator();
+ }
+ };
+
+ final Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder(cliConfiguration.name())
+ .withDescription(cliConfiguration.description())
+ .withDefaultCommand(Help.class);
+ if (cliConfiguration.addDefaultCommands()) {
+ builder.withCommands(Help.class,
+ Names.class,
+ Start.class, Restart.class,
+ Status.class, Running.class,
+ Stop.class, Abandon.class,
+ Instances.class, Executions.class);
+ }
+ final Iterator<Class<? extends UserCommand>> userCommands = cliConfiguration.userCommands();
+ if (userCommands != null) {
+ while (userCommands.hasNext()) {
+ builder.withCommand(userCommands.next());
}
- } catch (final IOException e) {
- throw new IllegalStateException(e);
}
final Cli<Runnable> parser = builder.build();
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/8750f4be/tools/cli/src/main/java/org/apache/batchee/cli/command/CliConfiguration.java
----------------------------------------------------------------------
diff --git a/tools/cli/src/main/java/org/apache/batchee/cli/command/CliConfiguration.java b/tools/cli/src/main/java/org/apache/batchee/cli/command/CliConfiguration.java
new file mode 100644
index 0000000..ca6fad6
--- /dev/null
+++ b/tools/cli/src/main/java/org/apache/batchee/cli/command/CliConfiguration.java
@@ -0,0 +1,26 @@
+/*
+ * 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.batchee.cli.command;
+
+import java.util.Iterator;
+
+public interface CliConfiguration {
+ String name();
+ String description();
+ boolean addDefaultCommands();
+ Iterator<Class<? extends UserCommand>> userCommands();
+}