Remove redundant calls and callables, deprecated code and redundancy.

doc/notes/fcrepo4_deltas.md

@@ -133,6 +133,14 @@ the payload are ignored.
 Clients using the `Prefer` header to control PUT behavior as advertised by the
 specs should not notice any difference.
 
+### LDP-NR metadata by content negotiation
+
+FCREPO4 relies on the `/fcr:metadata` identifier to retrieve RDF metadata about
+an LDP-NR. LAKEsuperior supports this as a legacy option, but encourages the
+use of content negotiation to do the same. Any request to an LDP-NR with an
+`Accept` header set to one of the supported RDF serialization formats will
+yield the RDF metadata of the resource instead of the binary contents.
+
 
 ## Optional improvements
 
@@ -149,14 +157,6 @@ while leaving the other server-managed triples when retrieving a resource:
 
 The default behavior is including all children URIs.
 
-### LDP-NR metadata by content negotiation
-
-FCREPO4 relies on the `/fcr:metadata` identifier to retrieve RDF metadata about
-an LDP-NR. LAKEsuperior supports this as a legacy option, but encourages the
-use of content negotiation to do the same. Any request to an LDP-NR with an
-`Accept` header set to one of the supported RDF serialization formats will
-yield the RDF metadata of the resource instead of the binary contents.
-
 ### Optional deletion without leaving tombstone
 
 In LAKEsuperior, setting the `Prefer:no-tombstone` header option allows to

lakesuperior/model/ldp_nr.py

@@ -4,7 +4,7 @@ from rdflib.resource import Resource
 from rdflib.term import URIRef, Literal, Variable
 
 from lakesuperior.dictionaries.namespaces import ns_collection as nsc
-from lakesuperior.model.ldpr import Ldpr, transactional, must_exist
+from lakesuperior.model.ldpr import Ldpr, transactional
 from lakesuperior.model.ldp_rs import LdpRs
 
 class LdpNr(Ldpr):

lakesuperior/model/ldp_rs.py

@@ -12,7 +12,7 @@ from rdflib.term import URIRef, Literal, Variable
 from lakesuperior.dictionaries.namespaces import ns_collection as nsc
 from lakesuperior.dictionaries.srv_mgd_terms import  srv_mgd_subjects, \
         srv_mgd_predicates, srv_mgd_types
-from lakesuperior.model.ldpr import Ldpr, transactional, must_exist
+from lakesuperior.model.ldpr import Ldpr, transactional
 from lakesuperior.exceptions import ResourceNotExistsError, \
         ServerManagedTermError, SingleSubjectError
 from lakesuperior.toolbox import Toolbox
@@ -61,7 +61,6 @@ class LdpRs(Ldpr):
 
 
     @transactional
-    @must_exist
     def patch(self, update_str):
         '''
         https://www.w3.org/TR/ldp/#ldpr-HTTP_PATCH

lakesuperior/model/ldpr.py

@@ -41,32 +41,6 @@ def transactional(fn):
     return wrapper
 
 
-def must_exist(fn):
-    '''
-    Ensures that a method is applied to a stored resource.
-    Decorator for methods of the Ldpr class.
-    '''
-    def wrapper(self, *args, **kwargs):
-        if not self.is_stored:
-            raise ResourceNotExistsError(self.uuid)
-        return fn(self, *args, **kwargs)
-
-    return wrapper
-
-
-def must_not_exist(fn):
-    '''
-    Ensures that a method is applied to a resource that is not stored.
-    Decorator for methods of the Ldpr class.
-    '''
-    def wrapper(self, *args, **kwargs):
-        if self.is_stored:
-            raise ResourceExistsError(self.uuid)
-        return fn(self, *args, **kwargs)
-
-    return wrapper
-
-
 
 class Ldpr(metaclass=ABCMeta):
     '''LDPR (LDP Resource).
@@ -432,7 +406,6 @@ class Ldpr(metaclass=ABCMeta):
 
 
     @transactional
-    @must_exist
     def delete(self, inbound=True, delete_children=True, leave_tstone=True):
         '''
         https://www.w3.org/TR/ldp/#ldpr-HTTP_DELETE

lakesuperior/store_layouts/ldp_rs/base_rdf_layout.py

@@ -49,9 +49,6 @@ class BaseRdfLayout(metaclass=ABCMeta):
     - Methods starting with `ask_` return a boolean value.
     '''
 
-    # N.B. This is Fuseki-specific.
-    UNION_GRAPH_URI = URIRef('urn:x-arq:UnionGraph')
-
     _logger = logging.getLogger(__name__)
 
 
@@ -71,64 +68,10 @@ class BaseRdfLayout(metaclass=ABCMeta):
                 query_ep=config['webroot'] + config['query_ep'],
                 update_ep=config['webroot'] + config['update_ep'])
 
+        self.store = self._conn.store
 
-    @property
-    def store(self):
-        if not hasattr(self, '_store') or not self._store:
-            self._store = self._conn.store
-
-        return self._store
-
-
-    @property
-    def ds(self):
-        if not hasattr(self, '_ds'):
-            self._ds = self._conn.ds
-            self._ds.namespace_manager = nsm
-
-        return self._ds
-
-
-    ## PUBLIC METHODS ##
-
-    #def create_or_replace_rsrc(self, imr):
-    #    '''Create a resource graph in the main graph if it does not exist.
-
-    #    If it exists, replace the existing one retaining the creation date.
-    #    '''
-    #    if self.ask_rsrc_exists(imr.identifier):
-    #        self._logger.info(
-    #                'Resource {} exists. Removing all outbound triples.'
-    #                .format(imr.identifier))
-    #        ev_type = self.replace_rsrc(imr)
-    #    else:
-    #        ev_type = self.create_rsrc(imr)
-
-    #    return ev_type
-
-
-    #def delete_rsrc(self, urn, inbound=True, delete_children=True):
-    #    '''
-    #    Delete a resource and optionally its children.
-
-    #    @param urn (rdflib.term.URIRef) URN of the resource to be deleted.
-    #    @param inbound (boolean) If specified, delete all inbound relationships
-    #    as well (this is the default).
-    #    @param delete_children (boolean) Whether to delete all child resources.
-    #    This is normally true.
-    #    '''
-    #    inbound = inbound if self.config['referential_integrity'] == 'none' \
-    #            else True
-    #    rsrc = self.ds.resource(urn)
-    #    children = rsrc[nsc['ldp'].contains * '+'] if delete_children else []
-
-    #    self._do_delete_rsrc(rsrc, inbound)
-
-    #    for child_rsrc in children:
-    #        self._do_delete_rsrc(child_rsrc, inbound)
-    #        self.leave_tombstone(child_rsrc.identifier, urn)
-
-    #    return self.leave_tombstone(urn)
+        self.ds = self._conn.ds
+        self.ds.namespace_manager = nsm
 
 
     ## INTERFACE METHODS ##