Fixed servial bugs.

Author: jelly-b

client/edge/src/main/java/com/thefirstlineofcode/sand/client/edge/AbstractEdgeThing.java

@@ -134,6 +134,10 @@ public StandardStreamConfig getStreamConfig() {
 	@Override
 	public void setStreamConfig(StandardStreamConfig streamConfig) {
 		this.streamConfig = streamConfig;
+		Map<String, String> attributes = loadThingAttributes();
+		attributes.put(ATTRIBUTE_NAME_STREAM_CONFIG, getStreamConfigString());
+		
+		saveAttributes(attributes);
 	}
 
 	@Override
@@ -314,7 +318,7 @@ public void connect() {
 		logger.info("The thing tries to connect to server.");
 
 		try {
-			chatClient.connect(new UsernamePasswordToken(registeredThing.getThingName().toString(),
+			chatClient.connect(new UsernamePasswordToken(registeredThing.getThingName(),
 					registeredThing.getCredentials()));
 
 			if (isConnected()) {
@@ -613,7 +617,7 @@ protected RegisteredThing getRegisteredThing(Map<String, String> attributes) {
 		RegisteredThing registeredThing = new RegisteredThing();
 		registeredThing.setThingName(st.nextToken().trim());
 		registeredThing.setCredentials(st.nextToken().trim());
-		registeredThing.setCredentials(st.nextToken().trim());
+		registeredThing.setSecurityKey(BinaryUtils.decodeFromBase64(st.nextToken().trim()));
 
 		return registeredThing;
 	}

demo/protocols/src/main/java/com/thefirstlineofcode/sand/demo/protocols/Sl01ModelDescriptor.java

@@ -1,5 +1,6 @@
 package com.thefirstlineofcode.sand.demo.protocols;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import com.thefirstlineofcode.basalt.xmpp.core.Protocol;
@@ -19,7 +20,7 @@ public Sl01ModelDescriptor() {
 
 	@Override
 	public Map<Protocol, Class<?>> getSupportedActions() {
-		Map<Protocol, Class<?>> supportedActions = super.getSupportedActions();
+		Map<Protocol, Class<?>> supportedActions = new HashMap<>(super.getSupportedActions());
 
 		supportedActions.put(Flash.PROTOCOL, Flash.class);
 		supportedActions.put(TurnOn.PROTOCOL, TurnOn.class);

server/lite/things/src/main/java/com/thefirstlineofcode/sand/server/lite/things/ThingManager.java

@@ -449,12 +449,13 @@ public Class<?> getFollowedEventType(String model, Protocol protocol) {
 
 	@Override
 	public boolean isUnregisteredThing(String thingId, String registrationCode) {
-		if (isRegistered(thingId)) {
-			throw new ProtocolException(new Conflict());
-		}
-		
-		if (registrationCustomizer != null)
+		if (registrationCustomizer != null) {			
 			return registrationCustomizer.isUnregisteredThing(thingId, registrationCode);
+		} else {
+			if (isRegistered(thingId)) {
+				throw new ProtocolException(new Conflict());
+			} 
+		}	
 
 		return isValid(thingId);
 	}

server/lite/things/src/main/resources/META-INF/data/RegisteredThingMapper.xml

@@ -19,6 +19,6 @@
     </select>
 
 	<select id="selectCountByThingName" resultType="int">
-		SELECT count(*) FROM THING_IDENTITIES WHERE thing_name = #{0}
+		SELECT count(*) FROM REGISTERED_THINGS WHERE thing_name = #{0}
     </select>
 </mapper>

server/lite/things/src/main/resources/META-INF/data/ThingAuthorizationMapper.xml

@@ -7,7 +7,7 @@
     </insert>
 
     <update id="updateCanceled">
-		UPDATE THING_IDENTITIES SET canceled = #{1} WHERE thing_id = #{0}
+		UPDATE REGISTERED_THINGS SET canceled = #{1} WHERE thing_id = #{0}
     </update>
 
 	<select id="selectByThingId" resultMap="thingAuthorizationResultMap">

server/lite/things/src/main/resources/META-INF/data/ThingMapper.xml

@@ -15,7 +15,7 @@
     </select>
 
 	<select id="selectByThingName" resultType="com.thefirstlineofcode.sand.server.lite.things.D_Thing">
-		SELECT things.* FROM THINGS AS things LEFT JOIN THING_IDENTITIES as thing_identities ON things.thing_id = thing_identities.thing_id WHERE thing_identities.thing_name=#{0}
+		SELECT things.* FROM THINGS AS things LEFT JOIN REGISTERED_THINGS as registered_things ON things.thing_id = registered_things.thing_id WHERE registered_things.thing_name=#{0}
     </select>
 
 	<resultMap id="thingResultMap" type="Thing">
@@ -31,6 +31,6 @@
     </select>
 
 	<select id="selectCountByThingName" resultType="int">
-		SELECT count(*) FROM THINGS AS things LEFT JOIN THING_IDENTITIES as thing_identities ON things.thing_id = thing_identities.thing_id WHERE thing_identities.thing_name=#{0}
+		SELECT count(*) FROM THINGS AS things LEFT JOIN REGISTERED_THINGS as registered_things ON things.thing_id = registered_things.thing_id WHERE registered_things.thing_name=#{0}
     </select>
 </mapper>

server/things/src/main/java/com/thefirstlineofcode/sand/server/things/AbstractThingRegistrationCustomizer.java

@@ -2,6 +2,9 @@
 
 import java.util.Random;
 
+import com.thefirstlineofcode.basalt.xmpp.core.ProtocolException;
+import com.thefirstlineofcode.basalt.xmpp.core.stanza.error.BadRequest;
+import com.thefirstlineofcode.basalt.xmpp.core.stanza.error.Conflict;
 import com.thefirstlineofcode.sand.protocols.thing.IThingModelDescriptor;
 
 public abstract class AbstractThingRegistrationCustomizer implements IThingRegistrationCustomizer {
@@ -10,7 +13,10 @@ public abstract class AbstractThingRegistrationCustomizer implements IThingRegis
 	@Override
 	public boolean isUnregisteredThing(String thingId, String registrationKey) {
 		if (thingId == null || thingId.length() == 0)
-			return false;
+			throw new ProtocolException(new BadRequest("Null thing ID."));
+		
+		if (thingManager.isRegistered(thingId))
+			throw new ProtocolException(new Conflict());
 
 		IThingModelDescriptor[] modelDescriptors = thingManager.getModelDescriptors();
 		for  (IThingModelDescriptor modelDescriptor : modelDescriptors) {