Bug #13477

Improve by simplifying the code of resource sharing by ticket.

Author: mmoqui

core-services/sharing/src/main/java/org/silverpeas/core/sharing/FileSharingRuntimeException.java

@@ -32,41 +32,41 @@
 import org.silverpeas.core.node.model.NodePK;
 import org.silverpeas.core.node.service.NodeService;
 import org.silverpeas.core.sharing.security.AbstractShareableAccessControl;
+import org.silverpeas.core.sharing.security.AccessControlContext;
 
 import java.util.Collection;
 
 /**
- * Access control to shared nodes and their content.
+ * Access control of shared nodes and their content (publications and their attachments).
  */
-public class NodeAccessControl<R> extends AbstractShareableAccessControl<NodeTicket, R> {
+public class NodeAccessControl extends AbstractShareableAccessControl {
 
-  NodeAccessControl() {
-    super();
+  NodeAccessControl(NodeTicket ticket) {
+    super(ticket);
   }
 
   @Override
-  protected boolean isReadable(NodeTicket ticket, R accessedObject) {
-    NodePK nodePk = new NodePK(String.valueOf(ticket.getSharedObjectId()), ticket.getComponentId());
+  public boolean isReadable(AccessControlContext context) {
+    NodePK nodePk = new NodePK(String.valueOf(getSharingTicket().getSharedObjectId()),
+        getSharingTicket().getComponentId());
     Collection<NodePK> authorizedNodes = getNodeDescendants(nodePk);
     authorizedNodes.add(nodePk);
-    if (accessedObject instanceof SimpleDocument) {
-      SimpleDocument attachment = (SimpleDocument) accessedObject;
+    if (context.isAboutDocument()) {
+      SimpleDocument attachment = context.getDocument();
       return isPublicationReadable(new ResourceReference(attachment.
           getForeignId(), attachment.getInstanceId()), nodePk.getInstanceId(), authorizedNodes);
     }
-    if (accessedObject instanceof NodeDetail) {
-      NodeDetail node = (NodeDetail) accessedObject;
-      return authorizedNodes.contains(node.getNodePK());
-    }
-    return false;
+    NodeDetail node = context.getNode();
+    return authorizedNodes.contains(node.getNodePK());
   }
 
   protected Collection<NodePK> getPublicationFathers(ResourceReference pk) {
     return getPublicationService().getAllFatherPKInSamePublicationComponentInstance(new PublicationPK(pk.getId(), pk.getInstanceId()));
   }
 
   protected Collection<Location> getPublicationAliases(ResourceReference pk) {
-    return getPublicationService().getAllLocations(new PublicationPK(pk.getId(), pk.getInstanceId()));
+    return getPublicationService().getAllLocations(new PublicationPK(pk.getId(),
+        pk.getInstanceId()));
   }
 
   protected Collection<NodePK> getNodeDescendants(NodePK pk) {

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/NodeAccessControl.java

@@ -23,19 +23,18 @@
  */
 package org.silverpeas.core.sharing.model;
 
-import java.util.Date;
-
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-
+import org.silverpeas.core.node.model.NodeDetail;
+import org.silverpeas.core.node.model.NodePK;
+import org.silverpeas.core.node.service.NodeService;
+import org.silverpeas.core.sharing.security.AccessControlContext;
 import org.silverpeas.core.sharing.security.ShareableAccessControl;
 import org.silverpeas.core.sharing.security.ShareableNode;
 import org.silverpeas.core.sharing.security.ShareableResource;
 
-import org.silverpeas.core.admin.user.model.UserDetail;
-import org.silverpeas.core.node.service.NodeService;
-import org.silverpeas.core.node.model.NodeDetail;
-import org.silverpeas.core.node.model.NodePK;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.Date;
 
 /**
  *
@@ -46,30 +45,25 @@
 public class NodeTicket extends Ticket {
   private static final long serialVersionUID = 8560572170859334369L;
 
-  private static final NodeAccessControl<Object> accessControl = new NodeAccessControl<>();
-
   public NodeTicket(int sharedObjectId, String componentId, String creatorId, Date creationDate,
       Date endDate, int nbAccessMax) {
     super(sharedObjectId, componentId, creatorId, creationDate, endDate, nbAccessMax);
     this.sharedObjectType = NODE_TYPE;
   }
 
-  public NodeTicket(int sharedObjectId, String componentId, UserDetail creator, Date creationDate,
-      Date endDate, int nbAccessMax) {
-    super(sharedObjectId, componentId, creator, creationDate, endDate, nbAccessMax);
-    this.sharedObjectType = NODE_TYPE;
-  }
-
   protected NodeTicket() {
     this.sharedObjectType = NODE_TYPE;
   }
 
   @Override
-  public ShareableAccessControl<NodeTicket, Object> getAccessControl() {
-    return accessControl;
+  @Transient
+  public ShareableAccessControl getAccessControl() {
+    return new NodeAccessControl(this);
   }
 
   @Override
+  @Transient
+  @SuppressWarnings("unchecked")
   public ShareableResource<NodeDetail> getResource() {
     NodeService nodeService = NodeService.get();
     NodeDetail node = nodeService.getDetail(new NodePK(String.valueOf(getSharedObjectId()),

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/NodeTicket.java

@@ -24,29 +24,29 @@
 package org.silverpeas.core.sharing.model;
 
 import org.silverpeas.core.contribution.attachment.model.SimpleDocument;
-
-import org.silverpeas.core.sharing.security.AbstractShareableAccessControl;
 import org.silverpeas.core.contribution.publication.model.PublicationDetail;
+import org.silverpeas.core.sharing.security.AbstractShareableAccessControl;
+import org.silverpeas.core.sharing.security.AccessControlContext;
 
 /**
- * Access control to shared publications and their content
+ * Access control of shared publications and their attachments.
  */
-public class PublicationAccessControl<R>
-    extends AbstractShareableAccessControl<PublicationTicket, R> {
+public class PublicationAccessControl extends AbstractShareableAccessControl {
 
-  PublicationAccessControl() {
-    super();
+  PublicationAccessControl(PublicationTicket ticket) {
+    super(ticket);
   }
 
   @Override
-  protected boolean isReadable(PublicationTicket ticket, R accessedObject) throws Exception {
-    if (accessedObject instanceof SimpleDocument) {
-      SimpleDocument attachment = (SimpleDocument) accessedObject;
-      return attachment.getForeignId().equals(String.valueOf(ticket.getSharedObjectId()));
+  public boolean isReadable(AccessControlContext context) {
+    if (context.isAboutDocument()) {
+      SimpleDocument document = context.getDocument();
+      return document.getForeignId()
+          .equals(String.valueOf(getSharingTicket().getSharedObjectId()));
     }
-    if (accessedObject instanceof PublicationDetail) {
-      PublicationDetail publication = (PublicationDetail) accessedObject;
-      return ticket.getResource().getAccessedObject().equals(publication);
+    if (context.isAboutPublication()) {
+      PublicationDetail publication = context.getPublication();
+      return getSharingTicket().getResource().getAccessedObject().equals(publication);
     }
     return false;
   }

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/PublicationAccessControl.java

@@ -23,7 +23,6 @@
  */
 package org.silverpeas.core.sharing.model;
 
-import org.silverpeas.core.admin.user.model.UserDetail;
 import org.silverpeas.core.contribution.publication.model.PublicationDetail;
 import org.silverpeas.core.contribution.publication.model.PublicationPK;
 import org.silverpeas.core.contribution.publication.service.PublicationService;
@@ -33,6 +32,7 @@
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -45,30 +45,25 @@ public class PublicationTicket extends Ticket {
 
   private static final long serialVersionUID = 6661700474412230957L;
 
-  private static final PublicationAccessControl accessControl = new PublicationAccessControl();
-
   public PublicationTicket(int sharedObjectId, String componentId, String creatorId, Date creationDate,
       Date endDate, int nbAccessMax) {
     super(sharedObjectId, componentId, creatorId, creationDate, endDate, nbAccessMax);
     this.sharedObjectType = PUBLICATION_TYPE;
   }
 
-  public PublicationTicket(int sharedObjectId, String componentId, UserDetail creator, Date creationDate,
-      Date endDate, int nbAccessMax) {
-    super(sharedObjectId, componentId, creator, creationDate, endDate, nbAccessMax);
-    this.sharedObjectType = PUBLICATION_TYPE;
-  }
-
   protected PublicationTicket() {
     this.sharedObjectType = PUBLICATION_TYPE;
   }
 
   @Override
-  public ShareableAccessControl<PublicationTicket, PublicationDetail> getAccessControl() {
-    return accessControl;
+  @Transient
+  public ShareableAccessControl getAccessControl() {
+    return new PublicationAccessControl(this);
   }
 
   @Override
+  @Transient
+  @SuppressWarnings("unchecked")
   public ShareableResource<PublicationDetail> getResource() {
     PublicationService publicationService = PublicationService.get();
     PublicationDetail publication = publicationService.getDetail(new PublicationPK(String.valueOf(getSharedObjectId()),

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/PublicationTicket.java

@@ -24,20 +24,20 @@
 package org.silverpeas.core.sharing.model;
 
 import org.silverpeas.core.sharing.security.AbstractShareableAccessControl;
-import org.silverpeas.core.contribution.attachment.model.SimpleDocument;
+import org.silverpeas.core.sharing.security.AccessControlContext;
 
 /**
- * Access control to shared attachments
+ * Access control of shared documents.
  */
-public class SimpleFileAccessControl
-    extends AbstractShareableAccessControl<SimpleFileTicket, SimpleDocument> {
+public class SimpleFileAccessControl extends AbstractShareableAccessControl {
 
-  SimpleFileAccessControl() {
-    super();
+  SimpleFileAccessControl(SimpleFileTicket ticket) {
+    super(ticket);
   }
 
   @Override
-  protected boolean isReadable(SimpleFileTicket ticket, SimpleDocument document) throws Exception {
-    return ticket.getResource().getAccessedObject().equals(document);
+  public boolean isReadable(AccessControlContext context) {
+    return context.isAboutDocument()
+      && getSharingTicket().getResource().getAccessedObject().equals(context.getPublication());
   }
 }

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/SimpleFileAccessControl.java

@@ -23,16 +23,17 @@
  */
 package org.silverpeas.core.sharing.model;
 
-import org.silverpeas.core.sharing.security.ShareableAccessControl;
-import org.silverpeas.core.sharing.security.ShareableAttachment;
-import org.silverpeas.core.sharing.security.ShareableResource;
 import org.silverpeas.core.admin.user.model.UserDetail;
 import org.silverpeas.core.contribution.attachment.AttachmentServiceProvider;
 import org.silverpeas.core.contribution.attachment.model.SimpleDocument;
 import org.silverpeas.core.contribution.attachment.model.SimpleDocumentPK;
+import org.silverpeas.core.sharing.security.ShareableAccessControl;
+import org.silverpeas.core.sharing.security.ShareableAttachment;
+import org.silverpeas.core.sharing.security.ShareableResource;
 
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -43,8 +44,6 @@
 public class SimpleFileTicket extends Ticket {
   private static final long serialVersionUID = -475026338727454787L;
 
-  private static final SimpleFileAccessControl accessControl = new SimpleFileAccessControl();
-
   protected SimpleFileTicket() {
     this.sharedObjectType = FILE_TYPE;
   }
@@ -62,8 +61,9 @@ public SimpleFileTicket(int sharedObjectId, String componentId, String creatorId
   }
 
   @Override
+  @Transient
   public ShareableAccessControl getAccessControl() {
-    return accessControl;
+    return new SimpleFileAccessControl(this);
   }
 
   public SimpleFileTicket(String key, int sharedObjectId, String componentId, UserDetail creator,
@@ -73,6 +73,8 @@ public SimpleFileTicket(String key, int sharedObjectId, String componentId, User
   }
 
   @Override
+  @Transient
+  @SuppressWarnings("unchecked")
   public ShareableResource<SimpleDocument> getResource() {
     SimpleDocumentPK pk = new SimpleDocumentPK(null, getComponentId());
     pk.setOldSilverpeasId(getSharedObjectId());

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/SimpleFileTicket.java

@@ -273,7 +273,7 @@ public void addDownload() {
 
   public abstract ShareableAccessControl getAccessControl();
 
-  public abstract ShareableResource getResource();
+  public abstract <R> ShareableResource<R> getResource();
 
   public enum QUERY_ORDER_BY {
 

core-services/sharing/src/main/java/org/silverpeas/core/sharing/model/Ticket.java

@@ -24,21 +24,20 @@
 package org.silverpeas.core.sharing.model;
 
 import org.silverpeas.core.sharing.security.AbstractShareableAccessControl;
-import org.silverpeas.core.contribution.attachment.model.HistorisedDocument;
+import org.silverpeas.core.sharing.security.AccessControlContext;
 
 /**
- * Access control to shared version documents.
+ * Access control of shared versioned documents.
  */
-public class VersionFileAccessControl
-    extends AbstractShareableAccessControl<VersionFileTicket, HistorisedDocument> {
+public class VersionFileAccessControl extends AbstractShareableAccessControl {
 
-  VersionFileAccessControl() {
-    super();
+  VersionFileAccessControl(VersionFileTicket ticket) {
+    super(ticket);
   }
 
   @Override
-  protected boolean isReadable(VersionFileTicket ticket, HistorisedDocument document)
-      throws Exception {
-    return ticket.getDocument().equals(document);
+  public boolean isReadable(AccessControlContext context) {
+    VersionFileTicket theTicket = (VersionFileTicket) getSharingTicket();
+    return context.isAboutDocument() && theTicket.getDocument().equals(context.getDocument());
   }
 }