Removed dependency on predefined vocabularies

Author: mestebangutierrez

frontend/core/src/main/java/org/ldp4j/tutorial/frontend/contact/ContactConstraints.java

@@ -37,7 +37,6 @@
 import org.ldp4j.application.data.constraints.Constraints.Cardinality;
 import org.ldp4j.application.data.constraints.Constraints.PropertyConstraint;
 import org.ldp4j.application.data.constraints.Constraints.Shape;
-import org.ldp4j.application.domain.RDFS;
 import org.ldp4j.application.ext.InconsistentContentException;
 import org.ldp4j.application.ext.UnsupportedContentException;
 import org.ldp4j.tutorial.application.api.Contact;
@@ -52,6 +51,8 @@ final class ContactConstraints implements ContactVocabulary {
 
 	private static final String XSD_STRING = "http://www.w3.org/2001/XMLSchema#string";
 
+	private static final String RDFS_RESOURCE = "http://www.w3.org/2000/01/rdf-schema#Resource";
+
 	private ContactConstraints() {
 	}
 
@@ -79,7 +80,7 @@ private static Constraints createConstraints(Contact contact) {
 					withPropertyConstraint(
 						Constraints.
 							propertyConstraint(URI.create(NUMBER)).
-								withValueType(RDFS.RESOURCE.as(URI.class)).
+								withValueType(URI.create(RDFS_RESOURCE)).
 								withCardinality(Cardinality.mandatory()));
 
 		PropertyConstraint emailConstraint = null;
@@ -119,7 +120,7 @@ private static Constraints createConstraints(Contact contact) {
 					withPropertyConstraint(
 						Constraints.
 							propertyConstraint(URI.create(URL)).
-								withValueType(RDFS.RESOURCE.as(URI.class)).
+								withValueType(URI.create(RDFS_RESOURCE)).
 								withCardinality(Cardinality.mandatory())).
 					withPropertyConstraint(
 						Constraints.

frontend/core/src/main/java/org/ldp4j/tutorial/frontend/contact/ContactMapper.java

@@ -35,7 +35,6 @@
 import org.ldp4j.application.data.DataSetUtils;
 import org.ldp4j.application.data.Individual;
 import org.ldp4j.application.data.Name;
-import org.ldp4j.application.domain.RDF;
 import org.ldp4j.tutorial.application.api.Contact;
 import org.ldp4j.tutorial.frontend.util.IdentityUtil;
 import org.ldp4j.tutorial.frontend.util.Mapper;
@@ -139,7 +138,7 @@ static DataSet toDataSet(Contact contact) {
 
 		helper.
 			managedIndividual(contactName, ContactHandler.ID).
-				property(RDF.TYPE).
+				property(TYPE).
 					withIndividual(INDIVIDUAL).
 				property(FULL_NAME).
 					withLiteral(contact.getFullName()).
@@ -152,7 +151,7 @@ static DataSet toDataSet(Contact contact) {
 
 		helper.
 			localIndividual(telephoneName).
-				property(RDF.TYPE).
+				property(TYPE).
 					withIndividual(HOME).
 					withIndividual(VOICE).
 				property(NUMBER).

frontend/core/src/main/java/org/ldp4j/tutorial/frontend/contact/ContactVocabulary.java

@@ -26,11 +26,10 @@
  */
 package org.ldp4j.tutorial.frontend.contact;
 
-import org.ldp4j.application.domain.RDF;
 
 interface ContactVocabulary {
 
-	static final String TYPE       = RDF.TYPE.qualifiedEntityName();
+	static final String TYPE       = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
 
 	static final String INDIVIDUAL = "http://www.w3.org/2006/vcard/ns#Individual";
 	static final String HOME       = "http://www.w3.org/2006/vcard/ns#Home";

frontend/core/src/main/java/org/ldp4j/tutorial/frontend/person/PersonMapper.java

@@ -36,7 +36,6 @@
 import org.ldp4j.application.data.ManagedIndividual;
 import org.ldp4j.application.data.ManagedIndividualId;
 import org.ldp4j.application.data.Name;
-import org.ldp4j.application.domain.RDF;
 import org.ldp4j.tutorial.application.api.Person;
 import org.ldp4j.tutorial.frontend.util.IdentityUtil;
 import org.ldp4j.tutorial.frontend.util.Mapper;
@@ -139,7 +138,7 @@ static DataSet toDataSet(Person person) {
 
 		DataSet dataSet = DataSetFactory.createDataSet(personName);
 
-		addObjectPropertyValue(dataSet,personName,RDF.TYPE.qualifiedEntityName(),PERSON);
+		addObjectPropertyValue(dataSet,personName,TYPE,PERSON);
 		addObjectPropertyValue(dataSet,personName,EMAIL,person.getEmail());
 		addDatatypePropertyValue(dataSet,personName,NAME,person.getName());
 		addObjectPropertyValue(dataSet,personName,LOCATION,person.getLocation());

frontend/core/src/main/java/org/ldp4j/tutorial/frontend/person/PersonVocabulary.java

@@ -28,11 +28,13 @@
 
 interface PersonVocabulary {
 
-	static final String PERSON = "http://xmlns.com/foaf/0.1/Person";
+	static final String TYPE               = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
+
+	static final String PERSON             = "http://xmlns.com/foaf/0.1/Person";
 
 	static final String WORKPLACE_HOMEPAGE = "http://xmlns.com/foaf/0.1/workplaceHomepage";
-	static final String LOCATION = "http://xmlns.com/foaf/0.1/based_near";
-	static final String NAME = "http://xmlns.com/foaf/0.1/name";
-	static final String EMAIL = "http://xmlns.com/foaf/0.1/mbox";
+	static final String LOCATION           = "http://xmlns.com/foaf/0.1/based_near";
+	static final String NAME               = "http://xmlns.com/foaf/0.1/name";
+	static final String EMAIL              = "http://xmlns.com/foaf/0.1/mbox";
 
 }