From 0872d7654f8bfb3a9b85dcd7d13c27e9a5d699f9 Mon Sep 17 00:00:00 2001 From: omenem Date: Thu, 9 Apr 2020 15:38:03 +0200 Subject: [PATCH] 4 attempt to pass pipeline --- .../smarthut/dto/SecurityCameraSaveRequest.java | 3 +-- .../sa4/sanmarinoes/smarthut/models/SecurityCamera.java | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java index 69f2da9..ee1e873 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java @@ -1,7 +1,6 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.dto; import javax.validation.constraints.NotNull; -import org.springframework.core.io.FileSystemResource; public class SecurityCameraSaveRequest { @@ -20,7 +19,7 @@ public class SecurityCameraSaveRequest { /** The name of the device as assigned by the user (e.g. 'Master bedroom light') */ @NotNull private String name; - private FileSystemResource surveillanceVideo; + private String path; public void setRoomId(Long roomId) { this.roomId = roomId; diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java index 7450df4..b638150 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java @@ -1,6 +1,5 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; -import java.io.File; import javax.persistence.Column; import javax.persistence.Entity; import javax.validation.constraints.NotNull; @@ -20,12 +19,10 @@ public class SecurityCamera extends Switchable { @Column(name = "video", nullable = false) @NotNull - private FileSystemResource surveillanceVideo = - new FileSystemResource( - (new File("backend/media/security_camera_videos/security_camera_1.mp4"))); + private String path = "backend/media/security_camera_videos/security_camera_1.mp4"; public FileSystemResource getSurveillanceVideo() { - return surveillanceVideo; + return new FileSystemResource(path); } @Override