From 53ba7a2adf7a2fa69e8ff764e638296822a0802a Mon Sep 17 00:00:00 2001
From: Ivona Mircheva <ivona1mircheva@gmail.com>
Date: Fri, 6 Jul 2018 16:37:29 +0300
Subject: [PATCH 1/4] Add video field to speaker.

Co-authored-by: AlexLaskin <ale.laskintues19@gmail.com>
Co-authored-by: MagiMarinova <magi.marinowax@gmail.com>
---
 migrate-add-videos.sql                        |  1 +
 src/main/java/site/model/Speaker.java         |  9 +++++++++
 src/main/webapp/WEB-INF/tags/user/speaker.tag |  8 ++++++++
 src/main/webapp/admin/speaker/edit.jsp        |  8 ++++++++
 src/main/webapp/admin/speaker/view.jsp        |  2 ++
 src/main/webapp/admin/submission/view.jsp     |  4 ++++
 src/main/webapp/speaker.jsp                   | 20 ++++++++++++++-----
 7 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 migrate-add-videos.sql

diff --git a/migrate-add-videos.sql b/migrate-add-videos.sql
new file mode 100644
index 00000000..7fd71e9a
--- /dev/null
+++ b/migrate-add-videos.sql
@@ -0,0 +1 @@
+ALTER TABLE USER ADD COLUMN VIDEOS VARCHAR(255);
\ No newline at end of file
diff --git a/src/main/java/site/model/Speaker.java b/src/main/java/site/model/Speaker.java
index 113284a5..728589ff 100644
--- a/src/main/java/site/model/Speaker.java
+++ b/src/main/java/site/model/Speaker.java
@@ -38,6 +38,8 @@ public class Speaker extends User {
 
     @Lob
     private byte[] picture;
+    
+    private String videos;
 
     @OneToMany(mappedBy = "speaker", cascade = CascadeType.REMOVE, fetch = FetchType.LAZY, targetEntity = Submission.class)
     private Set<Submission> submissions = new HashSet<>();
@@ -81,6 +83,13 @@ public String getBio() {
     public void setBio(String bio) {
         this.bio = bio;
     }
+    
+    public String getVideos() {
+    	return videos;
+    }
+    public void setVideos(String videos) {
+    	this.videos = videos;
+    }
 
     public String getTwitter() {
         return twitter;
diff --git a/src/main/webapp/WEB-INF/tags/user/speaker.tag b/src/main/webapp/WEB-INF/tags/user/speaker.tag
index d10e3964..5b6a8fe7 100644
--- a/src/main/webapp/WEB-INF/tags/user/speaker.tag
+++ b/src/main/webapp/WEB-INF/tags/user/speaker.tag
@@ -44,6 +44,14 @@
         <form:textarea path="${role}.bio" style="width:80%" rows="5" />
     </dd>
 </dl>
+<dl>
+	<dt>
+		<label for="${role}.videos">Video</label>
+	</dt>
+	<dd>
+		<form:textarea path="${role}.videos" style="width:80%" rows="3" />
+	</dd>
+</dl>
 <dl>
     <dt>
         <label for="${role}Image">Image</label>
diff --git a/src/main/webapp/admin/speaker/edit.jsp b/src/main/webapp/admin/speaker/edit.jsp
index 5b4055c2..7adeb48c 100644
--- a/src/main/webapp/admin/speaker/edit.jsp
+++ b/src/main/webapp/admin/speaker/edit.jsp
@@ -117,6 +117,14 @@
 					<input name="file" type="file" />
 				</dd>
 			</dl>
+			<dl>
+				<dt>
+					<label for="videos">Videos</label>
+				</dt>
+				<dd>
+					<form:input path="videos" />
+				</dd>
+			</dl>
 			<sec:csrfInput />
 			<form:hidden path="id" />
 			<form:hidden path="createdDate" />
diff --git a/src/main/webapp/admin/speaker/view.jsp b/src/main/webapp/admin/speaker/view.jsp
index b796c7a7..1e264dfc 100644
--- a/src/main/webapp/admin/speaker/view.jsp
+++ b/src/main/webapp/admin/speaker/view.jsp
@@ -29,6 +29,7 @@
 				<td><i>Accepted?</i></td>
 				<td><i>Branch?</i></td>
 				<td><i>Picture</i></td>
+				<td><i>Video</i></td>
 				<td><i>Operations</i></td>
 			</tr>
 			<c:forEach var="speaker" items="${speakers.content}">
@@ -42,6 +43,7 @@
 					<td>${speaker.accepted}</td>
 					<td>${speaker.branch}</td>
 					<td><img src="/image/speaker/${speaker.id}" style="max-width: 280px"/></td>
+					<td>${speaker.videos}</td>
 					<td>
 						<span style="float:left;"><a href="/admin/speaker/edit/${speaker.id}">Edit</a></span> &nbsp; 
 						<span style="float:right;"><a href="/admin/speaker/remove/${speaker.id}"> Remove </a></span> 
diff --git a/src/main/webapp/admin/submission/view.jsp b/src/main/webapp/admin/submission/view.jsp
index 83ce1167..b6b7696a 100644
--- a/src/main/webapp/admin/submission/view.jsp
+++ b/src/main/webapp/admin/submission/view.jsp
@@ -33,7 +33,9 @@
                 <td><i>Level</i></td>
 				<td><i>Type</i></td>
 				<td><i>Speaker</i></td>
+				<td><i>Speaker video</i></td>
 				<td><i>Co-Speaker</i></td>
+				<td><i>Co-Speaker video</i></td>
 				<td><i>Branch</i></td>
                 <td><i>Status</i></td>
 				<td><i>Operations</i></td>
@@ -45,7 +47,9 @@
                     <td>${submission.level}</td>
 					<td>${submission.type != null ? submission.type.toString() : "Conference session"}</td>
 					<td>${submission.speaker.firstName} ${submission.speaker.lastName}</td>
+					<td>${submission.speaker.videos}</td>
 					<td>${submission.coSpeaker.firstName} ${submission.coSpeaker.lastName}</td>
+					<td>${submission.coSpeaker.videos}</td>
 					<td>${submission.branch}</td>
                     <td>${submission.status}</td>
 					<td>
diff --git a/src/main/webapp/speaker.jsp b/src/main/webapp/speaker.jsp
index b5a9cf38..5c1477cf 100644
--- a/src/main/webapp/speaker.jsp
+++ b/src/main/webapp/speaker.jsp
@@ -50,7 +50,7 @@
 
                     <a href="/speakers">Back</a><br/><br/>
                     <!-- Start Single Post Area -->
-                    <div class="blog-post gallery-post">
+                    <div class="blog-post gallery-post" style="margin-bottom: 10em;">
                         <div class="col-md-3 col-sm-6 col-xs-12 animated">
                             <div class="team-member modern">
                                 <!-- Memebr Photo, Name & Position -->
@@ -64,10 +64,20 @@
                                 </div>
                             </div>
                         </div>
-
-                        <p>
-                            <c:out value="${speaker.bio}"/>
-                        </p>
+                        <div>
+                            <p>
+                                <c:out value="${speaker.bio}"/>
+                            </p>
+                        </div>
+                    </div>
+                     <div>
+                    	<c:forEach items="${speaker.videos.split(' ')}" var="video">
+                    		<div style= "width: 50%; height:50%; margin-left: 30%; margin-top: 2%">
+                            	<iframe  align = "centered"src="${video}"
+                          		          frameborder="1" allow="autoplay; encrypted-media" allowfullscreen>
+                        	  	</iframe>
+                    	    </div>
+                  	  </c:forEach>
                     </div>
                     <!-- End Single Post Area -->
                     <!-- currently not needed!!

From bf04fc1684d14b1a78914168b72f3423521bef92 Mon Sep 17 00:00:00 2001
From: Ivona Mircheva <ivona1mircheva@gmail.com>
Date: Tue, 10 Jul 2018 11:16:12 +0300
Subject: [PATCH 2/4] Update and test video field functionality

Co-authored-by: AlexLaskin <ale.laskintues19@gmail.com>
Co-authored-by: MagiMarinova <magi.marinowax@gmail.com>
---
 .../controller/AbstractCfpController.java     | 16 +++++--
 src/main/java/site/facade/AdminService.java   | 37 +++++++++++++--
 src/main/java/site/facade/CSVService.java     |  9 +++-
 .../site/facade/VideoSanitizerService.java    | 11 +++++
 src/main/java/site/model/Speaker.java         | 20 ++++++--
 .../controller/SubmissionControllerTest.java  | 46 ++++++++++++++-----
 .../controller/VideoSanitizerServiceTest.java | 29 ++++++++++++
 7 files changed, 141 insertions(+), 27 deletions(-)
 create mode 100644 src/main/java/site/facade/VideoSanitizerService.java
 create mode 100644 src/test/java/site/controller/VideoSanitizerServiceTest.java

diff --git a/src/main/java/site/controller/AbstractCfpController.java b/src/main/java/site/controller/AbstractCfpController.java
index de525158..a42f4918 100644
--- a/src/main/java/site/controller/AbstractCfpController.java
+++ b/src/main/java/site/controller/AbstractCfpController.java
@@ -6,7 +6,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -15,24 +14,28 @@
 import site.facade.MailService;
 import site.facade.ThumbnailService;
 import site.facade.UserService;
+import site.facade.VideoSanitizerService;
 import site.model.Branch;
 import site.model.SessionLevel;
+import site.model.SessionType;
 import site.model.Speaker;
 import site.model.Submission;
-import site.model.SessionType;
 
 /**
  * @author Ivan St. Ivanov
  */
 public class AbstractCfpController {
-
+	
+	@Autowired
+	private VideoSanitizerService videoSanitizerService;
+	
     @Autowired
     @Qualifier(UserService.NAME)
     protected UserService userFacade;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier(MailService.NAME)
-    @Lazy
+//    @Lazy
     protected MailService mailFacade;
 
     @Autowired
@@ -75,6 +78,9 @@ private Speaker handleSubmittedSpeaker(Speaker speaker, MultipartFile image) {
             fixTwitterHandle(speaker);
             speaker.setBranch(Globals.CURRENT_BRANCH);
             formatPicture(speaker, image);
+            if(speaker.getVideos() != null) {
+            	speaker.setVideos(videoSanitizerService.formatString(speaker.getVideos()));
+        	}
             return speaker;
         }
     }
diff --git a/src/main/java/site/facade/AdminService.java b/src/main/java/site/facade/AdminService.java
index 95186580..14be44aa 100644
--- a/src/main/java/site/facade/AdminService.java
+++ b/src/main/java/site/facade/AdminService.java
@@ -1,5 +1,7 @@
 package site.facade;
 
+import java.util.List;
+
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,10 +11,30 @@
 import org.springframework.stereotype.Service;
 
 import site.config.Globals;
-import site.model.*;
-import site.repository.*;
-
-import java.util.List;
+import site.model.Article;
+import site.model.Branch;
+import site.model.Partner;
+import site.model.Registrant;
+import site.model.Session;
+import site.model.Speaker;
+import site.model.Sponsor;
+import site.model.Submission;
+import site.model.SubmissionStatus;
+import site.model.Tag;
+import site.model.User;
+import site.model.VenueHall;
+import site.model.Visitor;
+import site.repository.ArticleRepository;
+import site.repository.PartnerRepository;
+import site.repository.RegistrantRepository;
+import site.repository.SessionRepository;
+import site.repository.SpeakerRepository;
+import site.repository.SponsorRepository;
+import site.repository.SubmissionRepository;
+import site.repository.TagRepository;
+import site.repository.UserRepository;
+import site.repository.VenueHallRepository;
+import site.repository.VisitorRepository;
 
 @Service(AdminService.NAME)
 @Transactional
@@ -20,6 +42,9 @@ public class AdminService {
 	
 	public static final String NAME = "adminFacade";
 	
+	@Autowired
+	private VideoSanitizerService videoSanitizerService;
+	
 	@Autowired
 	@Qualifier(ArticleRepository.NAME)
 	private ArticleRepository articleRepository;
@@ -141,6 +166,10 @@ public void deleteSpeaker(Long id){
 	}
 	
 	public Speaker saveSpeaker(Speaker speaker){
+		if(speaker.getVideos() != null)
+            speaker.setVideos(videoSanitizerService.
+            		formatString(speaker.getVideos()));
+       
 		return speakerRepository.save(speaker);
 	}
 	
diff --git a/src/main/java/site/facade/CSVService.java b/src/main/java/site/facade/CSVService.java
index b07a200a..36a9eb73 100644
--- a/src/main/java/site/facade/CSVService.java
+++ b/src/main/java/site/facade/CSVService.java
@@ -22,7 +22,7 @@ public class CSVService {
 	private static final Logger logger = LogManager.getLogger(CSVService.class);
 	public static final String NAME = "csvFacade";
 	final String[] submissionHeader = new String[] { "Title", "Abstract", "Session level", "Session type", "Speaker Name", "Speaker Bio",
-			"Co-Speaker Name", "Co-Speaker Bio" };
+			"Co-Speaker Name", "Co-Speaker Bio" , "Speaker Videos", "Co-Speaker Videos"};
 	
 	public File exportSubmissions(List<Submission> submissions) throws IOException{
 		File submissionsCSVFile = File.createTempFile("submissions.", ".csv");
@@ -34,7 +34,7 @@ public File exportSubmissions(List<Submission> submissions) throws IOException{
 	}
 	
 	private void writeSubmissions(List<Submission> submissions, ICsvMapWriter mapWriter) throws IOException{
-		CellProcessor[] processors = new CellProcessor[] {null, null, null, null, null, null, null, null};
+		CellProcessor[] processors = new CellProcessor[] {null, null, null, null, null, null, null, null, null, null};
    	 	Map<String, Object> submissionRow;
    	 	mapWriter.writeHeader(submissionHeader);
    	 	
@@ -50,6 +50,11 @@ private void writeSubmissions(List<Submission> submissions, ICsvMapWriter mapWri
 				submissionRow.put(submissionHeader[6], submission.getCoSpeaker().getFirstName());
 				submissionRow.put(submissionHeader[7], submission.getCoSpeaker().getBio());
 			}
+			submissionRow.put(submissionHeader[8] , submission.getSpeaker().getVideos());
+			if(submission.getCoSpeaker() != null) {
+				submissionRow.put(submissionHeader[9] , submission.getCoSpeaker().getVideos());
+			}
+
 			mapWriter.write(submissionRow, submissionHeader, processors);
 		}
 	}
diff --git a/src/main/java/site/facade/VideoSanitizerService.java b/src/main/java/site/facade/VideoSanitizerService.java
new file mode 100644
index 00000000..384c4ccc
--- /dev/null
+++ b/src/main/java/site/facade/VideoSanitizerService.java
@@ -0,0 +1,11 @@
+package site.facade;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class VideoSanitizerService {
+
+	public String formatString(String video) {
+		return video.replaceAll("(\t|\n|,| |;)+", " ");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/site/model/Speaker.java b/src/main/java/site/model/Speaker.java
index 728589ff..ad64a123 100644
--- a/src/main/java/site/model/Speaker.java
+++ b/src/main/java/site/model/Speaker.java
@@ -1,5 +1,8 @@
 package site.model;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -13,9 +16,6 @@
 
 import site.config.Globals;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 public class Speaker extends User {
@@ -23,6 +23,7 @@ public class Speaker extends User {
     /**
      *
      */
+	
     private static final long serialVersionUID = 1L;
 
     @Column(length = 1024)
@@ -30,7 +31,7 @@ public class Speaker extends User {
 
     private String headline;
 
-    private String twitter;
+    private String twitter;	
 
     private Boolean featured = false;
 
@@ -59,6 +60,17 @@ public Speaker(String firstName, String lastName, String email, String headline,
         this.featured = featured;
         this.accepted = accepted;
     }
+    
+    public Speaker(String firstName, String lastName, String email, String headline, String twitter, boolean featured, boolean accepted, String videos) {
+        setFirstName(firstName);
+        setLastName(lastName);
+        setEmail(email);
+        this.headline = headline;
+        this.twitter = twitter;
+        this.featured = featured;
+        this.accepted = accepted;
+        setVideos(videos);
+    }
 
     public byte[] getPicture() {
         return picture;
diff --git a/src/test/java/site/controller/SubmissionControllerTest.java b/src/test/java/site/controller/SubmissionControllerTest.java
index 1cd6ae24..ddaf0947 100644
--- a/src/test/java/site/controller/SubmissionControllerTest.java
+++ b/src/test/java/site/controller/SubmissionControllerTest.java
@@ -1,6 +1,7 @@
 package site.controller;
 
 import org.junit.Before;
+import org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@
 import site.app.Application;
 import site.config.Globals;
 import site.facade.CSVService;
+import site.facade.VideoSanitizerService;
 import site.model.Branch;
 import site.model.SessionLevel;
 import site.model.SessionType;
@@ -28,6 +30,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
@@ -45,6 +49,8 @@
 @Transactional
 public class SubmissionControllerTest {
 
+    private VideoSanitizerService videoSanitizerService = new VideoSanitizerService();
+
     @Autowired
     private WebApplicationContext wac;
 
@@ -55,7 +61,7 @@ public class SubmissionControllerTest {
     @Autowired
     @Qualifier(SubmissionRepository.NAME)
     private SubmissionRepository submissionRepository;
-    
+
     @Autowired
     @Qualifier(CSVService.NAME)
     private CSVService csvFacade;
@@ -72,7 +78,7 @@ public void setUp() throws Exception {
 
         mockMvc = MockMvcBuilders.webAppContextSetup(wac).build();
 
-        Speaker brianGoetz = new Speaker("Brian", "Goetz", "brian@oracle.com", "The Java Language Architect", "@briangoetz", true, true);
+        Speaker brianGoetz = new Speaker("Brian", "Goetz", "brian@oracle.com", "The Java Language Architect", "@briangoetz", true, true, "youtube.com,youtube.com;someurl.com");
         Speaker ivanIvanov = new Speaker("Ivan St.", "Ivanov", "ivan@jprime.io", "JBoss Forge", "@ivan_stefanov", false, true);
         Speaker naydenGochev = new Speaker("Nayden", "Gochev", "nayden@jprio.io", "The Spring Guy", "@gochev", false, true);
         Speaker ivanIvanov2 = new Speaker("Ivan St.", "Ivanov", "ivan@forge.com", "JBoss Forge", "@ivan_stefanov", false, true);
@@ -171,14 +177,30 @@ public void editSubmissionFormShouldContainInModelSubmissionToBeEdited() throws
 
     @Test
     public void exportSubmissionsAsCSVShouldReturnSubmissionsCSVFile() throws Exception{
-    	File exportSubmissions = csvFacade.exportSubmissions(submissionRepository.
-    			findByBranchAndStatus(Globals.CURRENT_BRANCH, SubmissionStatus.SUBMITTED));
-    	String length = Long.toString(exportSubmissions.length());
-    	
-    	mockMvc.perform(get("/admin/submission/exportCSV/"))
-    	.andExpect(status().isOk())
-    	.andExpect(header().string("Content-Length", length));
-    	
-    	exportSubmissions.delete();
+        File exportSubmissions = csvFacade.exportSubmissions(submissionRepository.
+                findByBranchAndStatus(Globals.CURRENT_BRANCH, SubmissionStatus.SUBMITTED));
+        String length = Long.toString(exportSubmissions.length());
+
+        mockMvc.perform(get("/admin/submission/exportCSV/"))
+                .andExpect(status().isOk())
+                .andExpect(header().string("Content-Length", length));
+
+        exportSubmissions.delete();
+    }
+
+    @Test
+    public void videosTest() {
+        Speaker brianGoetz = new Speaker("Brian", "Goetz", "brian@oracle.com", "The Java Language Architect", "@briangoetz", true, true,
+                "youtube.com,, youtube.com;someurl.com\nsomeurl.com\t,anotherurl.com");
+        brianGoetz.setVideos(videoSanitizerService.formatString(brianGoetz.getVideos()));
+        assertFalse(brianGoetz.getVideos().contains(","));
+        assertFalse(brianGoetz.getVideos().contains(",,"));
+        assertFalse(brianGoetz.getVideos().contains(";"));
+        assertFalse(brianGoetz.getVideos().contains("\n"));
+        assertFalse(brianGoetz.getVideos().contains("\t"));
+
+
+        assertTrue(videoSanitizerService.formatString(brianGoetz.getVideos()).split(" ").length == 5);
+
     }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/site/controller/VideoSanitizerServiceTest.java b/src/test/java/site/controller/VideoSanitizerServiceTest.java
new file mode 100644
index 00000000..b210cbdc
--- /dev/null
+++ b/src/test/java/site/controller/VideoSanitizerServiceTest.java
@@ -0,0 +1,29 @@
+package site.controller;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import site.facade.VideoSanitizerService;
+import site.model.Speaker;
+
+public class VideoSanitizerServiceTest {
+
+	private VideoSanitizerService videoSanitizerService = new VideoSanitizerService();
+
+	@Test
+	public void formatStringTest() {
+		String testString = "Sometext.With,Alot of;punctuation\twhichshould\nbesplitted, one.com, hh ,,, em.co.uk";
+		String formatedString = videoSanitizerService.formatString(testString);
+
+		assertTrue(formatedString.split(" ").length == 9);
+
+		assertFalse(formatedString.contains(","));
+		assertFalse(formatedString.contains("  "));
+		assertFalse(formatedString.contains(";"));
+		assertFalse(formatedString.contains("\n"));
+		assertFalse(formatedString.contains("\t"));
+	}
+}
\ No newline at end of file

From be514b9630356340d887bfaf6bd2563b9f6e1187 Mon Sep 17 00:00:00 2001
From: I-Mircheva <ivona1mircheva@gmail.com>
Date: Tue, 10 Jul 2018 13:39:15 +0300
Subject: [PATCH 3/4] Update AbstractCfpController.java

---
 src/main/java/site/controller/AbstractCfpController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/site/controller/AbstractCfpController.java b/src/main/java/site/controller/AbstractCfpController.java
index a42f4918..110ecc92 100644
--- a/src/main/java/site/controller/AbstractCfpController.java
+++ b/src/main/java/site/controller/AbstractCfpController.java
@@ -33,9 +33,9 @@ public class AbstractCfpController {
     @Qualifier(UserService.NAME)
     protected UserService userFacade;
 
-    @Autowired(required = false)
+    @Autowired
     @Qualifier(MailService.NAME)
-//    @Lazy
+    @Lazy
     protected MailService mailFacade;
 
     @Autowired

From 637ac0f92227d4960fcd4de0f18e623fb437401f Mon Sep 17 00:00:00 2001
From: Ivona Mircheva <ivona1mircheva@gmail.com>
Date: Thu, 12 Jul 2018 14:20:46 +0300
Subject: [PATCH 4/4] Format errors fix

Co-authored-by: AlexLaskin ale.laskintues19@gmail.com
Co-authored-by: MagiMarinova magi.marinowax@gmail.com
---
 migrate-add-videos.sql                               |  2 +-
 .../java/site/controller/AbstractCfpController.java  | 11 +++++------
 src/main/java/site/facade/AdminService.java          | 12 +++++-------
 src/main/java/site/facade/StringSanitizer.java       |  9 +++++++++
 src/main/java/site/facade/VideoSanitizerService.java | 11 -----------
 src/main/java/site/model/Speaker.java                |  2 +-
 ...izerServiceTest.java => StringSanitizerTest.java} | 11 +++--------
 .../site/controller/SubmissionControllerTest.java    |  9 +++------
 8 files changed, 27 insertions(+), 40 deletions(-)
 create mode 100644 src/main/java/site/facade/StringSanitizer.java
 delete mode 100644 src/main/java/site/facade/VideoSanitizerService.java
 rename src/test/java/site/controller/{VideoSanitizerServiceTest.java => StringSanitizerTest.java} (63%)

diff --git a/migrate-add-videos.sql b/migrate-add-videos.sql
index 7fd71e9a..09f7c0ad 100644
--- a/migrate-add-videos.sql
+++ b/migrate-add-videos.sql
@@ -1 +1 @@
-ALTER TABLE USER ADD COLUMN VIDEOS VARCHAR(255);
\ No newline at end of file
+ALTER TABLE USER ADD COLUMN VIDEOS VARCHAR(1024);
\ No newline at end of file
diff --git a/src/main/java/site/controller/AbstractCfpController.java b/src/main/java/site/controller/AbstractCfpController.java
index 110ecc92..4cf22a40 100644
--- a/src/main/java/site/controller/AbstractCfpController.java
+++ b/src/main/java/site/controller/AbstractCfpController.java
@@ -6,6 +6,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -14,7 +15,7 @@
 import site.facade.MailService;
 import site.facade.ThumbnailService;
 import site.facade.UserService;
-import site.facade.VideoSanitizerService;
+import site.facade.StringSanitizer;
 import site.model.Branch;
 import site.model.SessionLevel;
 import site.model.SessionType;
@@ -25,9 +26,7 @@
  * @author Ivan St. Ivanov
  */
 public class AbstractCfpController {
-	
-	@Autowired
-	private VideoSanitizerService videoSanitizerService;
+
 	
     @Autowired
     @Qualifier(UserService.NAME)
@@ -78,8 +77,8 @@ private Speaker handleSubmittedSpeaker(Speaker speaker, MultipartFile image) {
             fixTwitterHandle(speaker);
             speaker.setBranch(Globals.CURRENT_BRANCH);
             formatPicture(speaker, image);
-            if(speaker.getVideos() != null) {
-            	speaker.setVideos(videoSanitizerService.formatString(speaker.getVideos()));
+            if (speaker.getVideos() != null) {
+            	speaker.setVideos(StringSanitizer.formatString(speaker.getVideos()));
         	}
             return speaker;
         }
diff --git a/src/main/java/site/facade/AdminService.java b/src/main/java/site/facade/AdminService.java
index 14be44aa..0202886d 100644
--- a/src/main/java/site/facade/AdminService.java
+++ b/src/main/java/site/facade/AdminService.java
@@ -42,9 +42,6 @@ public class AdminService {
 	
 	public static final String NAME = "adminFacade";
 	
-	@Autowired
-	private VideoSanitizerService videoSanitizerService;
-	
 	@Autowired
 	@Qualifier(ArticleRepository.NAME)
 	private ArticleRepository articleRepository;
@@ -166,10 +163,11 @@ public void deleteSpeaker(Long id){
 	}
 	
 	public Speaker saveSpeaker(Speaker speaker){
-		if(speaker.getVideos() != null)
-            speaker.setVideos(videoSanitizerService.
-            		formatString(speaker.getVideos()));
-       
+		if (speaker.getVideos() != null) {
+			speaker.setVideos(StringSanitizer.
+					formatString(speaker.getVideos()));
+		}
+
 		return speakerRepository.save(speaker);
 	}
 	
diff --git a/src/main/java/site/facade/StringSanitizer.java b/src/main/java/site/facade/StringSanitizer.java
new file mode 100644
index 00000000..362f7334
--- /dev/null
+++ b/src/main/java/site/facade/StringSanitizer.java
@@ -0,0 +1,9 @@
+package site.facade;
+
+
+public class StringSanitizer {
+
+	public static String formatString(String video) {
+		return video.replaceAll("(\t|\n|,| |;)+", " ");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/site/facade/VideoSanitizerService.java b/src/main/java/site/facade/VideoSanitizerService.java
deleted file mode 100644
index 384c4ccc..00000000
--- a/src/main/java/site/facade/VideoSanitizerService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package site.facade;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class VideoSanitizerService {
-
-	public String formatString(String video) {
-		return video.replaceAll("(\t|\n|,| |;)+", " ");
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/site/model/Speaker.java b/src/main/java/site/model/Speaker.java
index ad64a123..bb969a9d 100644
--- a/src/main/java/site/model/Speaker.java
+++ b/src/main/java/site/model/Speaker.java
@@ -31,7 +31,7 @@ public class Speaker extends User {
 
     private String headline;
 
-    private String twitter;	
+    private String twitter;
 
     private Boolean featured = false;
 
diff --git a/src/test/java/site/controller/VideoSanitizerServiceTest.java b/src/test/java/site/controller/StringSanitizerTest.java
similarity index 63%
rename from src/test/java/site/controller/VideoSanitizerServiceTest.java
rename to src/test/java/site/controller/StringSanitizerTest.java
index b210cbdc..2b0e1d87 100644
--- a/src/test/java/site/controller/VideoSanitizerServiceTest.java
+++ b/src/test/java/site/controller/StringSanitizerTest.java
@@ -4,19 +4,14 @@
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import site.facade.VideoSanitizerService;
-import site.model.Speaker;
-
-public class VideoSanitizerServiceTest {
-
-	private VideoSanitizerService videoSanitizerService = new VideoSanitizerService();
+import site.facade.StringSanitizer;
 
+public class StringSanitizerTest {
 	@Test
 	public void formatStringTest() {
 		String testString = "Sometext.With,Alot of;punctuation\twhichshould\nbesplitted, one.com, hh ,,, em.co.uk";
-		String formatedString = videoSanitizerService.formatString(testString);
+		String formatedString = StringSanitizer.formatString(testString);
 
 		assertTrue(formatedString.split(" ").length == 9);
 
diff --git a/src/test/java/site/controller/SubmissionControllerTest.java b/src/test/java/site/controller/SubmissionControllerTest.java
index ddaf0947..cee0cfe6 100644
--- a/src/test/java/site/controller/SubmissionControllerTest.java
+++ b/src/test/java/site/controller/SubmissionControllerTest.java
@@ -1,7 +1,6 @@
 package site.controller;
 
 import org.junit.Before;
-import org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +15,7 @@
 import site.app.Application;
 import site.config.Globals;
 import site.facade.CSVService;
-import site.facade.VideoSanitizerService;
+import site.facade.StringSanitizer;
 import site.model.Branch;
 import site.model.SessionLevel;
 import site.model.SessionType;
@@ -49,8 +48,6 @@
 @Transactional
 public class SubmissionControllerTest {
 
-    private VideoSanitizerService videoSanitizerService = new VideoSanitizerService();
-
     @Autowired
     private WebApplicationContext wac;
 
@@ -192,7 +189,7 @@ public void exportSubmissionsAsCSVShouldReturnSubmissionsCSVFile() throws Except
     public void videosTest() {
         Speaker brianGoetz = new Speaker("Brian", "Goetz", "brian@oracle.com", "The Java Language Architect", "@briangoetz", true, true,
                 "youtube.com,, youtube.com;someurl.com\nsomeurl.com\t,anotherurl.com");
-        brianGoetz.setVideos(videoSanitizerService.formatString(brianGoetz.getVideos()));
+        brianGoetz.setVideos(StringSanitizer.formatString(brianGoetz.getVideos()));
         assertFalse(brianGoetz.getVideos().contains(","));
         assertFalse(brianGoetz.getVideos().contains(",,"));
         assertFalse(brianGoetz.getVideos().contains(";"));
@@ -200,7 +197,7 @@ public void videosTest() {
         assertFalse(brianGoetz.getVideos().contains("\t"));
 
 
-        assertTrue(videoSanitizerService.formatString(brianGoetz.getVideos()).split(" ").length == 5);
+        assertTrue(StringSanitizer.formatString(brianGoetz.getVideos()).split(" ").length == 5);
 
     }
 }
\ No newline at end of file