story/VSPC-242

vspace/src/main/java/edu/asu/diging/vspace/core/data/SlideExternalLinkRepository.java

@@ -0,0 +1,17 @@
+package edu.asu.diging.vspace.core.data;
+
+import java.util.List;
+
+import org.javers.spring.annotation.JaversSpringDataAuditable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.impl.ExternalLinkSlide;
+
+@Repository
+@JaversSpringDataAuditable
+public interface SlideExternalLinkRepository extends PagingAndSortingRepository<ExternalLinkSlide, String> {
+
+    public List<IExternalLinkSlide> findBySlide_Id(String slideId);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/factory/IExternalLinkFactory.java

@@ -7,4 +7,4 @@ public interface IExternalLinkFactory {
 
     IExternalLink createExternalLink(String title, ISpace space);
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLink.java

@@ -12,4 +12,4 @@ public interface IExternalLink extends ILink<ExternalLinkValue> {
 
     void setExternalLink(String externalLink);
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/IExternalLinkSlide.java

@@ -0,0 +1,20 @@
+package edu.asu.diging.vspace.core.model;
+
+public interface IExternalLinkSlide{
+
+    String getId();
+
+    void setId(String id);
+
+    ISlide getSlide();
+
+    void setSlide(ISlide slide);
+
+    String getExternalLink();
+
+    void setExternalLink(String externalLink);
+
+    String getLabel();
+
+    void setLabel(String label);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/ILink.java

@@ -9,4 +9,4 @@ public interface ILink<T extends IVSpaceElement> extends IVSpaceElement{
     T getTarget();
 
     void setTarget(T target);
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/ISlide.java

@@ -15,4 +15,8 @@ public interface ISlide extends IVSpaceElement {
     IImageBlock getFirstImageBlock();
 
     ITextBlock getFirstMatchedTextBlock(String searchTerm);
+
+    List<IExternalLinkSlide> getExternalLinks();
+
+    void setExternalLinks(List<IExternalLinkSlide> externalLinks);
 }

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/ExternalLinkSlide.java

@@ -0,0 +1,72 @@
+package edu.asu.diging.vspace.core.model.impl;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+import edu.asu.diging.vspace.core.model.ISlide;
+
+@Entity
+public class ExternalLinkSlide extends VSpaceElement implements IExternalLinkSlide {
+
+    @Id 
+    @GeneratedValue(generator = "extlinkslide_id_generator")
+    @GenericGenerator(name = "extlinkslide_id_generator", 
+        parameters = @Parameter(name = "prefix", value = "EXLS"), 
+        strategy = "edu.asu.diging.vspace.core.data.IdGenerator")
+    private String id;
+
+    @ManyToOne(targetEntity=Slide.class)
+    @JoinColumn(name="slide_id", nullable=false)
+    private ISlide slide;
+
+    private String externalLink;
+
+    private String label;
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public ISlide getSlide() {
+        return slide;
+    }
+
+    @Override
+    public void setSlide(ISlide slide) {
+        this.slide = slide;
+    }
+
+    @Override
+    public String getExternalLink() {
+        return externalLink;
+    }
+
+    @Override
+    public void setExternalLink(String externalLink) {
+        this.externalLink = externalLink;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+    @Override
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

vspace/src/main/java/edu/asu/diging/vspace/core/model/impl/Slide.java

@@ -1,5 +1,6 @@
 package edu.asu.diging.vspace.core.model.impl;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -19,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import edu.asu.diging.vspace.core.model.IContentBlock;
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISequence;
@@ -45,6 +47,10 @@ public class Slide extends VSpaceElement implements ISlide {
     @ManyToMany(mappedBy = "slides", targetEntity = Sequence.class)
     private List<ISequence> sequence;
 
+    @JsonIgnore
+    @OneToMany(mappedBy = "slide", targetEntity = ExternalLinkSlide.class, cascade = CascadeType.ALL)
+    private List<IExternalLinkSlide> externalLinks;
+
     /*
      * (non-Javadoc)
      * 
@@ -86,6 +92,30 @@ public void setModule(IModule module) {
         this.module = module;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#getExternalLinks()
+     */
+    @Override
+    public List<IExternalLinkSlide> getExternalLinks() {
+        if (externalLinks == null) {
+            externalLinks = new ArrayList<IExternalLinkSlide>();
+        }
+        return externalLinks;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see edu.asu.diging.vspace.core.model.impl.ISlide#setExternalLinks(java.util.
+     * List)
+     */
+    @Override
+    public void setExternalLinks(List<IExternalLinkSlide> externalLinks) {
+        this.externalLinks = externalLinks;
+    }
+
     /*
      * (non-Javadoc)
      * 

vspace/src/main/java/edu/asu/diging/vspace/core/services/IExternalLinkManager.java

@@ -19,4 +19,6 @@ IExternalLinkDisplay updateLink(String title, String id, float positionX, float
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
             String imageFilename,ExternalLinkDisplayMode howToOpen)
             throws SpaceDoesNotExistException, LinkDoesNotExistsException, ImageCouldNotBeStoredException;
+
+
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideExternalLinkManager.java

@@ -0,0 +1,14 @@
+package edu.asu.diging.vspace.core.services;
+
+import edu.asu.diging.vspace.core.model.IExternalLinkSlide;
+
+public interface ISlideExternalLinkManager {
+
+    IExternalLinkSlide getLink(String externalLinkID);
+
+    IExternalLinkSlide createExternalLink(String title, String url, String slideId);
+
+    IExternalLinkSlide updateExternalLink(String title, String url, String id);
+
+    void deleteLink(String linkId);
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/ISlideManager.java

@@ -11,7 +11,6 @@
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.display.SlideType;
 import edu.asu.diging.vspace.core.model.impl.Sequence;
-import edu.asu.diging.vspace.core.model.impl.Slide;
 import edu.asu.diging.vspace.web.staff.forms.SlideForm;
 
 public interface ISlideManager {
@@ -20,7 +19,7 @@ public interface ISlideManager {
 
     ISlide createSlide(IModule module, SlideForm slideForm, SlideType type);
 
-    void updateSlide(Slide slide);
+    ISlide updateSlide(ISlide slide);
 
     IBranchingPoint createBranchingPoint(IModule module, SlideForm slideForm, SlideType type);
 
@@ -32,5 +31,5 @@ public interface ISlideManager {
 
     List<Sequence> getSlideSequences(String slideId, String moduleId);
 
-    Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);
+    Page<ISlide> findByNameOrDescription(Pageable requestedPage,String searchText);    
 }

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ExternalLinkManager.java

@@ -10,14 +10,11 @@
 
 import edu.asu.diging.vspace.core.data.ExternalLinkDisplayRepository;
 import edu.asu.diging.vspace.core.data.ExternalLinkRepository;
-import edu.asu.diging.vspace.core.data.ImageRepository;
 import edu.asu.diging.vspace.core.exception.ImageCouldNotBeStoredException;
 import edu.asu.diging.vspace.core.exception.LinkDoesNotExistsException;
 import edu.asu.diging.vspace.core.exception.SpaceDoesNotExistException;
 import edu.asu.diging.vspace.core.factory.IExternalLinkDisplayFactory;
 import edu.asu.diging.vspace.core.factory.IExternalLinkFactory;
-import edu.asu.diging.vspace.core.factory.IImageFactory;
-import edu.asu.diging.vspace.core.file.IStorageEngine;
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.display.DisplayType;
@@ -36,7 +33,7 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
 
     @Autowired
     private ISpaceManager spaceManager;
-
+    
     @Autowired
     private ExternalLinkRepository externalLinkRepo;
 
@@ -49,15 +46,6 @@ public class ExternalLinkManager extends LinkManager<IExternalLink, ExternalLink
     @Autowired
     private IExternalLinkDisplayFactory externalLinkDisplayFactory;
 
-    @Autowired
-    private IImageFactory imageFactory;
-
-    @Autowired
-    private ImageRepository imageRepo;
-
-    @Autowired
-    private IStorageEngine storage;
-
     @Override
     public List<IExternalLinkDisplay> getLinkDisplays(String spaceId) {
         return externalLinkDisplayRepo.findExternalLinkDisplaysForSpace(spaceId);
@@ -158,4 +146,4 @@ public IExternalLinkDisplay updateLink(String title, String id, float positionX,
         return externalLinkDisplay;
     }
 
-}
+}

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/LinkManager.java

@@ -27,7 +27,7 @@ public abstract class LinkManager<L extends ILink<T>, T extends IVSpaceElement,
 
     @Autowired
     private ISpaceManager spaceManager;
-
+  
     @Autowired
     private IImageFactory imageFactory;
 
@@ -51,7 +51,7 @@ public U createLink(String title, String id, float positionX, float positionY, i
         return updateLinkAndDisplay(link, displayLink);
 
     }
-
+    
     @Override
     public U updateLink(String title, String id, float positionX, float positionY, int rotation, String linkedId,
             String linkLabel, String linkId, String linkDisplayId, DisplayType displayType, byte[] linkImage,
@@ -90,7 +90,7 @@ public void deleteLink(String linkId) {
     protected abstract L getLink(String linkId);
 
     protected abstract L createLinkObject(String title, String id);
-
+   
     protected abstract T getTarget(String linkedId);
 
     protected abstract U createDisplayLink(L link);
@@ -101,7 +101,7 @@ protected void validateSpace(String id) throws SpaceDoesNotExistException {
             throw new SpaceDoesNotExistException();
         }
     }
-
+    
     protected void setDisplayProperties(ILinkDisplay linkDisplay, String id, float positionX, float positionY,
             int rotation, DisplayType displayType, byte[] linkImage, String imageFilename)
             throws ImageCouldNotBeStoredException {

vspace/src/main/java/edu/asu/diging/vspace/core/services/impl/ModuleManager.java

@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -22,8 +21,8 @@
 import edu.asu.diging.vspace.core.model.ISequence;
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.impl.Module;
-import edu.asu.diging.vspace.core.model.impl.ModuleLink;
 import edu.asu.diging.vspace.core.services.IModuleManager;
+import edu.asu.diging.vspace.core.services.ISlideManager;
 
 @Transactional
 @Service
@@ -43,7 +42,7 @@ public class ModuleManager implements IModuleManager {
     private SequenceRepository sequenceRepo;
 
     @Autowired
-    private SlideManager slideManager;
+    private ISlideManager slideManager;
 
     @Autowired
     private ModuleLinkDisplayRepository moduleLinkDisplayRepo;