diff --git a/trellis-constraint-rules/src/main/java/org/trellisldp/constraint/LdpConstraints.java b/trellis-constraint-rules/src/main/java/org/trellisldp/constraint/LdpConstraints.java index 92d02b383..934ebb8d5 100644 --- a/trellis-constraint-rules/src/main/java/org/trellisldp/constraint/LdpConstraints.java +++ b/trellis-constraint-rules/src/main/java/org/trellisldp/constraint/LdpConstraints.java @@ -36,7 +36,6 @@ import org.apache.commons.rdf.api.Graph; import org.apache.commons.rdf.api.IRI; -import org.apache.commons.rdf.api.RDFTerm; import org.apache.commons.rdf.api.Triple; import org.slf4j.Logger; import org.trellisldp.api.ConstraintService; @@ -106,11 +105,6 @@ private static Predicate propertyFilter(final IRI model) { return of(model).filter(typeMap::containsKey).map(typeMap::get).orElse(basicConstraints); } - // Don't allow LDP types to be set explicitly - private static final Predicate typeFilter = triple -> - of(triple).filter(t -> t.getPredicate().equals(RDF.type)).map(Triple::getObject) - .map(RDFTerm::ntriplesString).filter(str -> str.startsWith("<" + LDP.URI)).isPresent(); - // Verify that the object of a triple whose predicate is either ldp:hasMemberRelation or ldp:isMemberOfRelation // is not equal to ldp:contains or any of the other cardinality-restricted IRIs private static Predicate invalidMembershipProperty = triple -> @@ -161,9 +155,6 @@ private Function> checkModelConstraints(fina of(triple).filter(propertyFilter(model)).map(t -> new ConstraintViolation(Trellis.InvalidProperty, t)) .ifPresent(builder::accept); - of(triple).filter(typeFilter).map(t -> new ConstraintViolation(Trellis.InvalidType, t)) - .ifPresent(builder::accept); - of(triple).filter(uriRangeFilter).map(t -> new ConstraintViolation(Trellis.InvalidRange, t)) .ifPresent(builder::accept); diff --git a/trellis-constraint-rules/src/test/java/org/trellisldp/constraint/LdpConstraintsTest.java b/trellis-constraint-rules/src/test/java/org/trellisldp/constraint/LdpConstraintsTest.java index d4ae01ec3..38e6957ee 100644 --- a/trellis-constraint-rules/src/test/java/org/trellisldp/constraint/LdpConstraintsTest.java +++ b/trellis-constraint-rules/src/test/java/org/trellisldp/constraint/LdpConstraintsTest.java @@ -127,18 +127,12 @@ public void testInvalidLdpProps() { } @Test - public void testInvalidType() { + public void testLdpType() { models.stream().forEach(ldpType -> { final String subject = domain + "foo"; final Optional res = svc.constrainedBy(ldpType, asGraph("/withLdpType.ttl", subject), domain).filter(v -> Trellis.InvalidType.equals(v.getConstraint())).findFirst(); - assertTrue(res.isPresent()); - res.ifPresent(violation -> { - assertEquals(Trellis.InvalidType, violation.getConstraint()); - assertEquals(1L, violation.getTriples().size()); - assertTrue(violation.getTriples().contains(rdf.createTriple(rdf.createIRI(subject), type, - LDP.Resource))); - }); + assertFalse(res.isPresent()); }); }