1. Move mud adaptation libraries to mud project. 2. Fixed a bug.

Author: XDongger

client/lora-dac/src/main/java/com/thefirstlineofcode/sand/client/lora/dac/LoraDacService.java

@@ -18,7 +18,6 @@
 import com.thefirstlineofcode.sand.client.thing.commuication.CommunicationException;
 import com.thefirstlineofcode.sand.client.thing.commuication.ICommunicationListener;
 import com.thefirstlineofcode.sand.client.thing.commuication.ICommunicator;
-import com.thefirstlineofcode.sand.client.thing.obx.IObxFactory;
 import com.thefirstlineofcode.sand.client.thing.obx.ObxFactory;
 import com.thefirstlineofcode.sand.protocols.lora.dac.Allocated;
 import com.thefirstlineofcode.sand.protocols.lora.dac.Allocation;
@@ -324,8 +323,7 @@ public void reset() {
 	}
 
 	private void processIsConfigured(byte[] data) throws CommunicationException, BxmppConversionException {
-		IObxFactory obxFactory = ObxFactory.getInstance();
-		IsConfigured isConfigured = (IsConfigured)obxFactory.toObject(data);
+		IsConfigured isConfigured = ObxFactory.getInstance().toObject(IsConfigured.class, data);
 
 		if (logger.isInfoEnabled()) {
 			logger.info("IsConfigured protocol received. Client thing ID: {}.", isConfigured.getThingId());
@@ -339,13 +337,13 @@ private void processIsConfigured(byte[] data) throws CommunicationException, Bxm
 				logger.info("Client which's thing ID is {} has been configured. Sending Configured protocol to it.", isConfigured.getThingId() );
 			}
 
-			communicator.send(address, obxFactory.toBinary(new Configured()));
+			communicator.send(address, ObxFactory.getInstance().toBinary(new Configured()));
 		} else {
 			if (logger.isInfoEnabled()) {
 				logger.info("Client which's thing ID is {} hasn't been configured. Sending NotConfigured protocol to it.", isConfigured.getThingId() );
 			}
 
-			communicator.send(address, obxFactory.toBinary(new NotConfigured()));
+			communicator.send(address, ObxFactory.getInstance().toBinary(new NotConfigured()));
 		}
 	}
 

client/thing/src/main/java/com/thefirstlineofcode/sand/client/thing/obx/ObxFactory.java

@@ -24,9 +24,12 @@
 import com.thefirstlineofcode.basalt.oxm.coc.CocParserFactory;
 import com.thefirstlineofcode.basalt.oxm.coc.CocTranslatorFactory;
 import com.thefirstlineofcode.basalt.oxm.coc.annotations.ProtocolObject;
+import com.thefirstlineofcode.basalt.oxm.parsing.FlawedProtocolObject;
 import com.thefirstlineofcode.basalt.xmpp.core.MessageProtocolChain;
 import com.thefirstlineofcode.basalt.xmpp.core.Protocol;
 import com.thefirstlineofcode.basalt.xmpp.core.ProtocolChain;
+import com.thefirstlineofcode.basalt.xmpp.core.ProtocolException;
+import com.thefirstlineofcode.basalt.xmpp.core.stanza.error.ServiceUnavailable;
 import com.thefirstlineofcode.basalt.xmpp.im.stanza.Message;
 import com.thefirstlineofcode.sand.protocols.actuator.Execution;
 import com.thefirstlineofcode.sand.protocols.actuator.LanExecution;
@@ -303,7 +306,13 @@ private void registerObjectTypeIfNeed(Class<?> type) {
 	public <T> T toObject(Class<T> type, byte[] data) throws BxmppConversionException {
 		registerObjectTypeIfNeed(type);
 
-		return getMessage(data).getObject();
+		T obj = getMessage(data).getObject();
+		if (FlawedProtocolObject.isFlawed(obj)) {
+			throw new ProtocolException(new ServiceUnavailable(String.format(
+					"Flawed protocol object: %s.", obj.toString())));
+		}
+		
+		return obj;
 	}
 
 	@Override
@@ -389,7 +398,13 @@ public void registerLanData(Class<?> lanDataType) {
 
 	@Override
 	public Object toObject(byte[] data) throws BxmppConversionException {
-		return getMessage(data).getObject();
+		Object obj = getMessage(data).getObject();
+		if (FlawedProtocolObject.isFlawed(obj)) {
+			throw new ProtocolException(new ServiceUnavailable(String.format(
+					"Flawed protocol object: %s.", obj.toString())));
+		}
+		
+		return obj;
 	}
 
 	private Message getMessage(byte[] data) throws BxmppConversionException {