pom updated

Author: ANDREA CIMMINO ARRIAGA

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>es.upm.fi.oeg</groupId>
 	<artifactId>wothive</artifactId>
-	<version>0.1.5</version>
+	<version>0.1.6</version>
 	<name>Directory for the Web of Things</name>
 
 	<properties>

src/main/java/directory/Utils.java

@@ -31,7 +31,7 @@ public class Utils {
 	public static final String METHOD_PUT = "PUT";
 
 	public static final String MIME_DIRECTORY_ERROR = "application/problem+json";
-	protected static final String DIRECTORY_VERSION = "WoTHive/0.1.5";
+	protected static final String DIRECTORY_VERSION = "WoTHive/0.1.6";
 	protected static final String WOT_DIRECTORY_LOGO = "\n"+
 			"██╗    ██╗ ██████╗ ████████╗\n" + 
 			"██║    ██║██╔═══██╗╚══██╔══╝\n" + 

src/main/java/directory/things/ThingsDAO.java

@@ -35,6 +35,8 @@ public static Boolean create(Thing thing, String graphId, Boolean exist) {
 		Boolean correct = false;
 		String query = null;
 		ThingsMapper.syntacticValidation(thing);
+		if(!thing.getId().contains(":")) 
+			thing.setId("id:"+thing.getId());
 
 		String thingRDF = ThingsMapper.thingToRDFWithValidation(thing, RDFFormat.NTRIPLES);
 		query = Utils.buildMessage("\nINSERT DATA { GRAPH <",graphId,"> { \n",thingRDF,"} }");

src/main/java/directory/things/ThingsMapper.java

@@ -64,7 +64,7 @@ public static Thing createJsonThing(String td) {
 		try {
 			JsonObject thingJson = JTD.parseJson(td);
 
-			if (!thingJson.has(ID1) || thingJson.has(ID2))
+			if (!thingJson.has(ID1) || !thingJson.has(ID2))
 				throw new ThingRegistrationException(
 						"Things under the form application/td+json registered using PUT method must provide a valid 'id', otherwhise se the POST method for Things without 'id'");
 			thing = Thing.fromJson(thingJson);