1. Refactoring actuator plugin. 2. Rename sand-demo-protocols to sand-demo-protocol.

Author: jelly-b

client/actuator/src/main/java/com/thefirstlineofcode/sand/client/actuator/Actuator.java

@@ -10,6 +10,7 @@
 
 import com.thefirstlineofcode.basalt.oxm.IOxmFactory;
 import com.thefirstlineofcode.basalt.oxm.coc.CocParserFactory;
+import com.thefirstlineofcode.basalt.oxm.coc.annotations.ProtocolObject;
 import com.thefirstlineofcode.basalt.xmpp.core.IqProtocolChain;
 import com.thefirstlineofcode.basalt.xmpp.core.JabberId;
 import com.thefirstlineofcode.basalt.xmpp.core.Protocol;
@@ -114,11 +115,17 @@ protected <T> void execute(Iq iq, Execution execution) {
 	@SuppressWarnings("unchecked")
 	private <T> IExecutor<T> createExecutor(T action) throws ProtocolException {
 		IExecutorFactory<T> executorFactory = (IExecutorFactory<T>)executorFactories.get(action.getClass());
+		
 		if (executorFactory != null)
 			return executorFactory.create();
 
 		return null;
 	}
+
+	@SuppressWarnings("unchecked")
+	private <T> void injectWorker(IWorkerAware<T> executor, Object worker) {
+		executor.setWorker((T)worker);
+	}
 
 	private IExecutor<?> createExecutor(Class<? extends IExecutor<?>> executorType) {
 		IExecutor<?> executor = null;
@@ -198,26 +205,44 @@ public void stop() {
 	}
 
 	@Override
-	public <T> void registerExecutor(Protocol protocol, Class<T> actionType, Class<? extends IExecutor<T>> executorType) {
-		registerExecutorFactory(new CreateByTypeExecutorFactory<T>(protocol, actionType, executorType));
+	public <T> void registerExecutor(Class<T> actionType, Class<? extends IExecutor<T>> executorType) {
+		registerExecutorFactory(new CreateByTypeExecutorFactory<T>(actionType, executorType, null));
+	}
+	
+	@Override
+	public <T> void registerExecutor(Class<T> actionType, Class<? extends IExecutor<T>> executorType, Object worker) {
+		registerExecutorFactory(new CreateByTypeExecutorFactory<T>(actionType, executorType, worker));
 	}
 
 	private class CreateByTypeExecutorFactory<T> implements IExecutorFactory<T> {
 		private Protocol protocol;
 		private Class<T> actionType;
 		private Class<? extends IExecutor<T>> executorType;
+		private Object worker;
 
-		public CreateByTypeExecutorFactory(Protocol protocol, Class<T> actionType,
-				Class<? extends IExecutor<T>> executorType) {
-			this.protocol = protocol;
+		public CreateByTypeExecutorFactory(Class<T> actionType,
+				Class<? extends IExecutor<T>> executorType, Object worker) {
 			this.actionType = actionType;
 			this.executorType = executorType;
+			this.worker = worker;
+			
+			ProtocolObject protocolObject = actionType.getAnnotation(ProtocolObject.class);
+			if (protocolObject == null)
+				throw new IllegalArgumentException(String.format("Not a protocol object. Object type: %s.",
+						actionType.getName()));
+			
+			protocol = new Protocol(protocolObject.namespace(), protocolObject.localName());
 		}
 
 		@SuppressWarnings("unchecked")
 		@Override
 		public IExecutor<T> create() {
-			return (IExecutor<T>)createExecutor(executorType);
+			IExecutor<T> executor = (IExecutor<T>)createExecutor(executorType);
+			if (executor instanceof IWorkerAware) {
+				injectWorker((IWorkerAware<?>)executor, worker);
+			}
+			
+			return executor;
 		}
 
 		@Override

client/actuator/src/main/java/com/thefirstlineofcode/sand/client/actuator/IActuator.java

@@ -1,9 +1,8 @@
 package com.thefirstlineofcode.sand.client.actuator;
 
-import com.thefirstlineofcode.basalt.xmpp.core.Protocol;
-
 public interface IActuator {
-	<T> void registerExecutor(Protocol protocol, Class<T> actionType, Class<? extends IExecutor<T>> executorType);
+	<T> void registerExecutor(Class<T> actionType, Class<? extends IExecutor<T>> executorType);
+	<T> void registerExecutor(Class<T> actionType, Class<? extends IExecutor<T>> executorType, Object worker);
 	<T> void registerExecutorFactory(IExecutorFactory<T> executorFactory);
 	boolean isExecutorRegistered(Class<?> actionType);
 	boolean unregisterExecutor(Class<?> actionType);

client/actuator/src/main/java/com/thefirstlineofcode/sand/client/actuator/IWorkerAware.java

@@ -0,0 +1,5 @@
+package com.thefirstlineofcode.sand.client.actuator;
+
+public interface IWorkerAware<T> {
+	void setWorker(T worker);
+}

demo/app-android/app/src/main/java/com/thefirstlineofcode/sand/demo/app/android/ThingsAdapter.java

@@ -132,7 +132,7 @@ private static class LanNodeViewHolder {
 	private String[] getAuthorizedThingActions(String model) {
 		if (model.startsWith("LGE-")) {
 			return new String[] {"Change Working Mode"};
-		} else if (model.equals("LGSC-01")) {
+		} else if ("LGSC-01".equals(model)) {
 			return new String[] {
 					"Change Working Mode",
 					"Reset DAC Service",
@@ -156,6 +156,8 @@ private String[] getAuthorizedThingActions(String model) {
 			};
 		} else if (model.startsWith("SL-")) {
 			return new String[] {"Flash", "Turn On", "Turn Off", "Stop", "Shutdown System"};
+		} else if ("HAT".equals(model)) {
+			return new String[] {"Flash", "Turn On", "Turn Off"};
 		} else {
 			throw new RuntimeException(String.format("Unknown thing model: %s.", model));
 		}

demo/client/pom.xml

@@ -28,7 +28,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.thefirstlineofcode.sand.demo</groupId>
-			<artifactId>sand-demo-protocols</artifactId>
+			<artifactId>sand-demo-protocol</artifactId>
 		</dependency>
 	</dependencies>
 

demo/pom.xml

@@ -17,7 +17,7 @@
 	<name>Sand IoT Demo Projects</name>
 
 	<modules>
-		<module>protocols</module>
+		<module>protocol</module>
 		<module>client</module>
 		<module>server</module>
 		<module>server-lite</module>

demo/protocols/pom.xml renamed to demo/protocol/pom.xml

@@ -13,8 +13,8 @@
 	</parent>
 
 	<groupId>com.thefirstlineofcode.sand.demo</groupId>
-	<artifactId>sand-demo-protocols</artifactId>
-	<name>Sand demo protocols</name>
+	<artifactId>sand-demo-protocol</artifactId>
+	<name>Sand demo protocol</name>
 
 	<dependencies>
 		<dependency>