Trivial modifications.

Author: jelly-b

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

@@ -487,7 +487,7 @@ public void register() {
 
 	private String getRegisteredThingString(RegisteredThing registeredThing) {
 		return String.format("%s,%s,%s", registeredThing.getThingName(),
-				registeredThing.getCredentials(), BinaryUtils.encodeToBase64(registeredThing.getSecurityKey()));
+				registeredThing.getCredentials(), BinaryUtils.encodeToBase64(registeredThing.getSecretKey()));
 	}
 
 	@Override
@@ -615,7 +615,7 @@ protected RegisteredThing getRegisteredThing(Map<String, String> attributes) {
 		RegisteredThing registeredThing = new RegisteredThing();
 		registeredThing.setThingName(st.nextToken().trim());
 		registeredThing.setCredentials(st.nextToken().trim());
-		registeredThing.setSecurityKey(BinaryUtils.decodeFromBase64(st.nextToken().trim()));
+		registeredThing.setSecretKey(BinaryUtils.decodeFromBase64(st.nextToken().trim()));
 
 		return registeredThing;
 	}

demo/server/src/main/resources/plugin.properties

@@ -2,4 +2,4 @@ plugin.id=sand-demo-server
 plugin.provider=TheFirstLineOfCode
 plugin.version=1.0.0-BETA2
 plugin.dependencies=sand-server-ibtr,sand-server-notification,sand-server-concentrator,sand-server-location,sand-server-sensor
-non-plugin.dependencies=sand-protocols-actuator,basalt-xeps-ping,sand-demo-protocols,sand-emulators-models,sand-protocols-edge,sand-protocols-lora-dac,sand-protocols-lora-gateway,sand-protocols-things-simple-light,sand-protocols-things-simple-camera,sand-protocols-things-simple-temperature-reporter,sand-protocols-webrtc-signaling,sand-protocols-operator
+non-plugin.dependencies=sand-protocols-actuator,basalt-xeps-ping,sand-demo-protocol,sand-emulators-models,sand-protocols-edge,sand-protocols-lora-dac,sand-protocols-lora-gateway,sand-protocols-things-simple-light,sand-protocols-things-simple-camera,sand-protocols-things-simple-temperature-reporter,sand-protocols-webrtc-signaling,sand-protocols-operator

protocols/ibtr/src/main/java/com/thefirstlineofcode/sand/protocols/ibtr/oxm/ThingRegisterParserFactory.java

@@ -100,7 +100,7 @@ public void processText(IParsingContext<ThingRegister> context, Value<?> text) {
 					@Override
 					public void processText(IParsingContext<ThingRegister> context, Value<?> text) {
 						RegisteredThing registeredThing = (RegisteredThing)context.getObject().getRegister();
-						registeredThing.setSecurityKey(BinaryUtils.decodeFromBase64(text.getString()));
+						registeredThing.setSecretKey(BinaryUtils.decodeFromBase64(text.getString()));
 					}
 				};
 			} else {

protocols/ibtr/src/main/java/com/thefirstlineofcode/sand/protocols/ibtr/oxm/ThingRegisterTranslatorFactory.java

@@ -52,7 +52,7 @@ public String translate(ThingRegister iqRegister, IProtocolWriter writer,
 				writer.writeElementBegin("registered-thing").
 					writeTextOnly("thing-name", registeredThing.getThingName()).
 					writeTextOnly("credentials", registeredThing.getCredentials()).
-					writeTextOnly("security-key", BinaryUtils.encodeToBase64(registeredThing.getSecurityKey())).					
+					writeTextOnly("security-key", BinaryUtils.encodeToBase64(registeredThing.getSecretKey())).					
 				writeElementEnd();
 			} else {
 				throw new RuntimeException("Unknown register object.");

protocols/thing/src/main/java/com/thefirstlineofcode/sand/protocols/thing/RegisteredThing.java

@@ -9,23 +9,23 @@ public class RegisteredThing implements Serializable {
 
 	private String thingName;
 	private String credentials;
-	private byte[] securityKey;
+	private byte[] secretKey;
 
 	public RegisteredThing() {}
 
-	public RegisteredThing(String thingName, String credentials, byte[] securityKey) {
+	public RegisteredThing(String thingName, String credentials, byte[] secretKey) {
 		if (thingName == null)
 			throw new IllegalArgumentException("Null thing name.");
 
 		if (credentials == null)
 			throw new IllegalArgumentException("Null credentials.");
 
-		if (securityKey == null)
-			throw new IllegalArgumentException("Null security key.");
+		if (secretKey == null)
+			throw new IllegalArgumentException("Null secret key.");
 
 		this.thingName = thingName;
 		this.credentials = credentials;
-		this.securityKey = securityKey;
+		this.secretKey = secretKey;
 	}
 
 	public void setThingName(String thingName) {
@@ -44,11 +44,11 @@ public String getCredentials() {
 		return credentials;
 	}
 
-	public byte[] getSecurityKey() {
-		return securityKey;
+	public byte[] getSecretKey() {
+		return secretKey;
 	}
 
-	public void setSecurityKey(byte[] securityKey) {
-		this.securityKey = securityKey;
+	public void setSecretKey(byte[] securityKey) {
+		this.secretKey = securityKey;
 	}
 }

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

@@ -154,15 +154,15 @@ public ThingRegistered register(String thingId, String registrationCode) {
 		registeredThing.setThingId(thingId);
 		registeredThing.setThingName(getThingName(thingId));
 		registeredThing.setCredentials(createCredentials());
-		registeredThing.setSecurityKey(createSecurityKey());
+		registeredThing.setSecretKey(createSecurityKey());
 
 		getThingIdentityMapper().insert(registeredThing);
 
 		return new ThingRegistered(thingId,
 				new RegisteredThing(
 						registeredThing.getThingName(),
 						registeredThing.getCredentials(),
-						registeredThing.getSecurityKey()),
+						registeredThing.getSecretKey()),
 						authorizer,
 						thing.getRegistrationTime());
 	}

server/things/src/main/java/com/thefirstlineofcode/sand/server/things/AbstractThingRegistrationCustomizer.java renamed to server/things/src/main/java/com/thefirstlineofcode/sand/server/things/ThingRegistrationCustomizerAdapter.java

@@ -7,7 +7,7 @@
 import com.thefirstlineofcode.basalt.xmpp.core.stanza.error.Conflict;
 import com.thefirstlineofcode.sand.protocols.thing.IThingModelDescriptor;
 
-public abstract class AbstractThingRegistrationCustomizer implements IThingRegistrationCustomizer {
+public class ThingRegistrationCustomizerAdapter implements IThingRegistrationCustomizer {
 	protected IThingManager thingManager;
 
 	@Override