summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/shell/src/main
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-11-19 12:54:21 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-11-19 12:54:21 +0000
commit03710e08c42f5da3e3637ad56a24d2c451131c1c (patch)
tree9b97d72b9a81ff6a2d6790f2db9536c13b94a006 /sca-java-2.x/trunk/modules/shell/src/main
parent0cd3f93d21ddede589827c9bf7c1e40b9543523f (diff)
Update to support service operation completion
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1036827 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/shell/src/main')
-rw-r--r--sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java (renamed from sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InvokeCompletor.java)8
-rw-r--r--sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java79
-rw-r--r--sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java2
3 files changed, 84 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InvokeCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
index e03dff1621..69b8fbd033 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InvokeCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
@@ -30,13 +30,13 @@ import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.shell.Shell;
/**
- * An Invoke command Completor
+ * A Completor for available services
*/
-public class InvokeCompletor extends SimpleCompletor {
+public class ServiceCompletor extends SimpleCompletor {
private Shell shell;
- public InvokeCompletor(Shell shell) {
+ public ServiceCompletor(Shell shell) {
super("");
this.shell = shell;
}
@@ -51,7 +51,7 @@ public class InvokeCompletor extends SimpleCompletor {
}
setCandidateStrings(services.toArray(new String[services.size()]));
}
- return super.complete(buffer, cursor, clist);
+ return super.complete(buffer, cursor, clist);
}
}
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
new file mode 100644
index 0000000000..8b74a4f7d6
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
@@ -0,0 +1,79 @@
+/*
+ * 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.tuscany.sca.shell.jline;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import jline.SimpleCompletor;
+
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.node2.impl.NodeImpl;
+import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.shell.Shell;
+
+/**
+ * A Completor for available service operations
+ */
+public class ServiceOperationCompletor extends SimpleCompletor {
+
+ private Shell shell;
+ private static final List<String> EXCLUDED_OPS = Arrays.asList(new String[] {"equals", "getClass",
+ "getInvocationHandler",
+ "getProxyClass", "hashCode",
+ "isProxyClass", "newProxyInstance",
+ "notify", "notifyAll", "toString",
+ "wait"});
+
+ public ServiceOperationCompletor(Shell shell) {
+ super("");
+ this.shell = shell;
+ }
+
+ @Override
+ public int complete(final String buffer, final int cursor, final List clist) {
+ String service = TShellCompletor.lastArg;
+ EndpointRegistry reg = ((NodeImpl)shell.getNode()).getEndpointRegistry();
+ List<Endpoint> endpoints = reg.findEndpoint(service);
+ if (endpoints.size() < 1) {
+ return -1;
+ }
+ String serviceName = null;
+ if (service.contains("/")) {
+ int i = service.indexOf("/");
+ if (i < service.length()-1) {
+ serviceName = service.substring(i+1);
+ }
+ }
+ Object proxy = ((RuntimeComponent)endpoints.get(0).getComponent()).getServiceReference(null, serviceName).getService();
+ Method[] ms = proxy.getClass().getMethods();
+ List<String> ops = new ArrayList<String>();
+ for (Method m : ms) {
+ if (!EXCLUDED_OPS.contains(m.getName())) {
+ ops.add(m.getName());
+ }
+ }
+ setCandidateStrings(ops.toArray(new String[ops.size()]));
+ return super.complete(buffer, cursor, clist);
+ }
+}
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
index 2f3e8e57c2..d27c83f951 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
@@ -55,7 +55,7 @@ public class TShellCompletor extends ArgumentCompletor {
completors.put("help", new Completor[]{commandCompletor, commandCompletor, new NullCompletor()});
completors.put("install", new Completor[]{commandCompletor, new InstallCompletor(shell)});
completors.put("installed", new Completor[]{commandCompletor, new ICURICompletor(shell), new NullCompletor()});
- completors.put("invoke", new Completor[]{commandCompletor, new InvokeCompletor(shell), new NullCompletor()});
+ completors.put("invoke", new Completor[]{commandCompletor, new ServiceCompletor(shell), new ServiceOperationCompletor(shell), new NullCompletor()});
completors.put("load", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});
completors.put("remove", new Completor[]{commandCompletor, new ICURICompletor(shell), new NullCompletor()});
completors.put("run", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});