Rename RpcReceiver to Snippet.

8 files changed, 55 insertions, 59 deletions

diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/FacadeManager.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/FacadeManager.java
index 5a0e1ad..7244539 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/FacadeManager.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/FacadeManager.java
@@ -16,13 +16,12 @@
 
 package com.google.android.mobly.snippet.facade;
 
-import android.app.Service;
 import android.content.Context;
 
 import com.google.android.mobly.snippet.rpc.RpcDeprecated;
 import com.google.android.mobly.snippet.rpc.RpcMinSdk;
-import com.google.android.mobly.snippet.rpc.RpcReceiver;
-import com.google.android.mobly.snippet.rpc.RpcReceiverManager;
+import com.google.android.mobly.snippet.rpc.Snippet;
+import com.google.android.mobly.snippet.rpc.SnippetManager;
 import com.google.android.mobly.snippet.util.SnippetLibException;
 import com.google.android.mobly.snippet.util.Log;
 
@@ -30,20 +29,20 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collection;
 
-public class FacadeManager extends RpcReceiverManager {
+public class FacadeManager extends SnippetManager {
 
   private final Context mContext;
   private int mSdkLevel;
 
   public FacadeManager(int sdkLevel, Context context,
-                       Collection<Class<? extends RpcReceiver>> classList) {
+                       Collection<Class<? extends Snippet>> classList) {
     super(context, classList);
     mSdkLevel = sdkLevel;
     mContext = context;
   }
 
   @Override
-  public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
+  public Object invoke(Class<? extends Snippet> clazz, Method method, Object[] args)
       throws Exception {
     try {
       if (method.isAnnotationPresent(RpcDeprecated.class)) {
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/ReflectionFacadeManagerFactory.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/ReflectionFacadeManagerFactory.java
index 5b87107..f86a1ae 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/ReflectionFacadeManagerFactory.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/facade/ReflectionFacadeManagerFactory.java
@@ -16,16 +16,15 @@
 
 package com.google.android.mobly.snippet.facade;
 
-import android.app.Service;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 
-import com.google.android.mobly.snippet.rpc.RpcReceiver;
-import com.google.android.mobly.snippet.rpc.RpcReceiverManager;
-import com.google.android.mobly.snippet.rpc.RpcReceiverManagerFactory;
+import com.google.android.mobly.snippet.rpc.Snippet;
+import com.google.android.mobly.snippet.rpc.SnippetManager;
+import com.google.android.mobly.snippet.rpc.SnippetManagerFactory;
 import com.google.android.mobly.snippet.util.Log;
 
 import java.util.Collections;
@@ -34,33 +33,33 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-public class ReflectionFacadeManagerFactory implements RpcReceiverManagerFactory {
+public class ReflectionFacadeManagerFactory implements SnippetManagerFactory {
     private static final String METADATA_TAG_NAME = "mobly-snippets";
 
     private final Context mContext;
-    private final Set<Class<? extends RpcReceiver>> mClasses;
-    private final Map<Integer, RpcReceiverManager> mFacadeManagers;
+    private final Set<Class<? extends Snippet>> mClasses;
+    private final Map<Integer, SnippetManager> mSnippetManagers;
 
     public ReflectionFacadeManagerFactory(Context context) {
         mContext = context;
-        mClasses = loadRpcReceivers();
-        mFacadeManagers = new HashMap<>();
+        mClasses = loadSnippets();
+        mSnippetManagers = new HashMap<>();
     }
 
     @Override
     public FacadeManager create(Integer UID) {
         int sdkLevel = Build.VERSION.SDK_INT;
         FacadeManager facadeManager = new FacadeManager(sdkLevel, mContext, mClasses);
-        mFacadeManagers.put(UID, facadeManager);
+        mSnippetManagers.put(UID, facadeManager);
         return facadeManager;
     }
 
     @Override
-    public Map<Integer, RpcReceiverManager> getRpcReceiverManagers() {
-        return Collections.unmodifiableMap(mFacadeManagers);
+    public Map<Integer, SnippetManager> getSnippetManagers() {
+        return Collections.unmodifiableMap(mSnippetManagers);
     }
 
-    private Set<Class<? extends RpcReceiver>> loadRpcReceivers() {
+    private Set<Class<? extends Snippet>> loadSnippets() {
         ApplicationInfo appInfo;
         try {
             appInfo = mContext
@@ -79,19 +78,19 @@ public class ReflectionFacadeManagerFactory implements RpcReceiverManagerFactory
                         + "name=\"" + METADATA_TAG_NAME + "\"");
         }
         String[] snippetClassNames = snippets.split("\\s*,\\s*");
-        Set<Class<? extends RpcReceiver>> receiverSet = new HashSet<>();
+        Set<Class<? extends Snippet>> receiverSet = new HashSet<>();
         for (String snippetClassName : snippetClassNames) {
             try {
-                Log.i("Trying to load RpcReceiver class: " + snippetClassName);
+                Log.i("Trying to load Snippet class: " + snippetClassName);
                 Class<?> snippetClass = Class.forName(snippetClassName);
-                receiverSet.add((Class<? extends RpcReceiver>) snippetClass);
+                receiverSet.add((Class<? extends Snippet>) snippetClass);
             } catch (ClassNotFoundException e) {
                 Log.e("Failed to find class " + snippetClassName);
                 throw new RuntimeException(e);
             }
         }
         if (receiverSet.isEmpty()) {
-            throw new IllegalStateException("Found no subclasses of RpcReceiver.");
+            throw new IllegalStateException("Found no subclasses of Snippet.");
         }
         return receiverSet;
     }
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/AndroidProxy.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/AndroidProxy.java
index eb0d82c..1fd832c 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/AndroidProxy.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/AndroidProxy.java
@@ -16,9 +16,7 @@
 
 package com.google.android.mobly.snippet.rpc;
 
-import android.app.Service;
 import android.content.Context;
-import android.content.Intent;
 
 import com.google.android.mobly.snippet.facade.ReflectionFacadeManagerFactory;
 
@@ -30,7 +28,7 @@ public class AndroidProxy {
     private InetSocketAddress mAddress;
     private final JsonRpcServer mJsonRpcServer;
     private final UUID mSecret;
-    private final RpcReceiverManagerFactory mFacadeManagerFactory;
+    private final SnippetManagerFactory mFacadeManagerFactory;
 
     /**
      *
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonRpcServer.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonRpcServer.java
index cde1303..9e57619 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonRpcServer.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/JsonRpcServer.java
@@ -34,26 +34,26 @@ public class JsonRpcServer extends SimpleServer {
 
     private static final String CMD_CLOSE_SESSION = "closeSl4aSession";
 
-    private final RpcReceiverManagerFactory mRpcReceiverManagerFactory;
+    private final SnippetManagerFactory mSnippetManagerFactory;
 
     // private final String mHandshake;
 
     /**
-     * Construct a {@link JsonRpcServer} connected to the provided {@link RpcReceiverManager}.
+     * Construct a {@link JsonRpcServer} connected to the provided {@link SnippetManager}.
      *
-     * @param managerFactory the {@link RpcReceiverManager} to register with the server
+     * @param managerFactory the {@link SnippetManager} to register with the server
      * @param handshake the secret handshake required for authorization to use this server
      */
-    public JsonRpcServer(RpcReceiverManagerFactory managerFactory, String handshake) {
+    public JsonRpcServer(SnippetManagerFactory managerFactory, String handshake) {
         // mHandshake = handshake;
-        mRpcReceiverManagerFactory = managerFactory;
+        mSnippetManagerFactory = managerFactory;
     }
 
     @Override
     public void shutdown() {
         super.shutdown();
         // Notify all RPC receiving objects. They may have to clean up some of their state.
-        for (RpcReceiverManager manager : mRpcReceiverManagerFactory.getRpcReceiverManagers()
+        for (SnippetManager manager : mSnippetManagerFactory.getSnippetManagers()
                 .values()) {
             manager.shutdown();
         }
@@ -62,18 +62,18 @@ public class JsonRpcServer extends SimpleServer {
     @Override
     protected void handleRPCConnection(Socket sock, Integer UID, BufferedReader reader,
             PrintWriter writer) throws Exception {
-        RpcReceiverManager receiverManager = null;
-        Map<Integer, RpcReceiverManager> mgrs = mRpcReceiverManagerFactory.getRpcReceiverManagers();
+        SnippetManager receiverManager = null;
+        Map<Integer, SnippetManager> mgrs = mSnippetManagerFactory.getSnippetManagers();
         synchronized (mgrs) {
             Log.d("UID " + UID);
             Log.d("manager map keys: "
-                    + mRpcReceiverManagerFactory.getRpcReceiverManagers().keySet());
+                    + mSnippetManagerFactory.getSnippetManagers().keySet());
             if (mgrs.containsKey(UID)) {
                 Log.d("Look up existing session");
                 receiverManager = mgrs.get(UID);
             } else {
                 Log.d("Create a new session");
-                receiverManager = mRpcReceiverManagerFactory.create(UID);
+                receiverManager = mSnippetManagerFactory.create(UID);
             }
         }
         // boolean passedAuthentication = false;
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
index 7463480..d50f070 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java
@@ -46,9 +46,9 @@ public final class MethodDescriptor {
   private static final Map<Class<?>, Converter<?>> sConverters = populateConverters();
 
   private final Method mMethod;
-  private final Class<? extends RpcReceiver> mClass;
+  private final Class<? extends Snippet> mClass;
 
-  public MethodDescriptor(Class<? extends RpcReceiver> clazz, Method method) {
+  public MethodDescriptor(Class<? extends Snippet> clazz, Method method) {
     mClass = clazz;
     mMethod = method;
   }
@@ -59,7 +59,7 @@ public final class MethodDescriptor {
   }
 
   /** Collects all methods with {@code RPC} annotation from given class. */
-  public static Collection<MethodDescriptor> collectFrom(Class<? extends RpcReceiver> clazz) {
+  public static Collection<MethodDescriptor> collectFrom(Class<? extends Snippet> clazz) {
     List<MethodDescriptor> descriptors = new ArrayList<MethodDescriptor>();
     for (Method method : clazz.getMethods()) {
       if (method.isAnnotationPresent(Rpc.class)) {
@@ -78,7 +78,7 @@ public final class MethodDescriptor {
    * @return result
    * @throws Throwable
    */
-  public Object invoke(RpcReceiverManager manager, final JSONArray parameters) throws Throwable {
+  public Object invoke(SnippetManager manager, final JSONArray parameters) throws Throwable {
 
     final Type[] parameterTypes = getGenericParameterTypes();
     final Object[] args = new Object[parameterTypes.length];
@@ -110,7 +110,7 @@ public final class MethodDescriptor {
    * @return result
    * @throws Throwable
    */
-  public Object invoke(RpcReceiverManager manager, final Bundle parameters) throws Throwable {
+  public Object invoke(SnippetManager manager, final Bundle parameters) throws Throwable {
     final Annotation annotations[][] = getParameterAnnotations();
     final Class<?>[] parameterTypes = getMethod().getParameterTypes();
     final Object[] args = new Object[parameterTypes.length];
@@ -129,7 +129,7 @@ public final class MethodDescriptor {
     return invoke(manager, args);
   }
 
-  private Object invoke(RpcReceiverManager manager, Object[] args) throws Throwable{
+  private Object invoke(SnippetManager manager, Object[] args) throws Throwable{
     Object result = null;
     try {
       result = manager.invoke(mClass, mMethod, args);
@@ -274,7 +274,7 @@ public final class MethodDescriptor {
     return mMethod;
   }
 
-  public Class<? extends RpcReceiver> getDeclaringClass() {
+  public Class<? extends Snippet> getDeclaringClass() {
     return mClass;
   }
 
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiver.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/Snippet.java
index 448aab8..a6286a0 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiver.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/Snippet.java
@@ -16,7 +16,7 @@
 
 package com.google.android.mobly.snippet.rpc;
 
-public interface RpcReceiver {
+public interface Snippet {
   /** Invoked when the receiver is shut down. */
   void shutdown();
 }
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiverManager.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SnippetManager.java
index 6661ac6..57dab7a 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiverManager.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SnippetManager.java
@@ -26,21 +26,21 @@ import java.util.Map;
 
 import com.google.android.mobly.snippet.util.Log;
 
-public abstract class RpcReceiverManager {
+public abstract class SnippetManager {
 
     private final Context mContext;
-    private final Map<Class<? extends RpcReceiver>, RpcReceiver> mReceivers;
+    private final Map<Class<? extends Snippet>, Snippet> mReceivers;
 
     /**
      * A map of strings to known RPCs.
      */
     private final Map<String, MethodDescriptor> mKnownRpcs = new HashMap<String, MethodDescriptor>();
 
-    public RpcReceiverManager(
-            Context context, Collection<Class<? extends RpcReceiver>> classList) {
+    public SnippetManager(
+            Context context, Collection<Class<? extends Snippet>> classList) {
         mContext = context;
         mReceivers = new HashMap<>();
-        for (Class<? extends RpcReceiver> receiverClass : classList) {
+        for (Class<? extends Snippet> receiverClass : classList) {
             mReceivers.put(receiverClass, null);
             Collection<MethodDescriptor> methodList = MethodDescriptor.collectFrom(receiverClass);
             for (MethodDescriptor m : methodList) {
@@ -55,13 +55,13 @@ public abstract class RpcReceiverManager {
         }
     }
 
-    private RpcReceiver get(Class<? extends RpcReceiver> clazz) {
-        RpcReceiver object = mReceivers.get(clazz);
+    private Snippet get(Class<? extends Snippet> clazz) {
+        Snippet object = mReceivers.get(clazz);
         if (object != null) {
             return object;
         }
 
-        Constructor<? extends RpcReceiver> constructor;
+        Constructor<? extends Snippet> constructor;
         try {
             constructor = clazz.getConstructor(Context.class);
             object = constructor.newInstance(mContext);
@@ -77,20 +77,20 @@ public abstract class RpcReceiverManager {
         return mKnownRpcs.get(methodName);
     }
 
-    public Object invoke(Class<? extends RpcReceiver> clazz, Method method, Object[] args)
+    public Object invoke(Class<? extends Snippet> clazz, Method method, Object[] args)
             throws Exception {
-        RpcReceiver object = get(clazz);
+        Snippet object = get(clazz);
         return method.invoke(object, args);
     }
 
     public void shutdown() {
-        for (RpcReceiver receiver : mReceivers.values()) {
+        for (Snippet receiver : mReceivers.values()) {
             try {
                 if (receiver != null) {
                     receiver.shutdown();
                 }
             } catch (Exception e) {
-                Log.e("Failed to shut down an RpcReceiver", e);
+                Log.e("Failed to shut down an Snippet", e);
             }
         }
     }
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiverManagerFactory.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SnippetManagerFactory.java
index 10135e0..68d5252 100644
--- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/RpcReceiverManagerFactory.java
+++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/SnippetManagerFactory.java
@@ -18,8 +18,8 @@ package com.google.android.mobly.snippet.rpc;
 
 import java.util.Map;
 
-public interface RpcReceiverManagerFactory {
-  public RpcReceiverManager create(Integer UID);
+public interface SnippetManagerFactory {
+  public SnippetManager create(Integer UID);
 
-  public Map<Integer, RpcReceiverManager> getRpcReceiverManagers();
+  public Map<Integer, SnippetManager> getSnippetManagers();
 }