Author: solomax
Date: Thu Nov 26 04:09:04 2015
New Revision: 1716564
URL: http://svn.apache.org/viewvc?rev=1716564&view=rev
Log:
[OPENMEETINGS-1118] code clean-up on file service
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Thu Nov 26 04:09:04 2015
@@ -56,10 +56,10 @@ public class FlvExplorerConverter extend
public int height = 0;
}
- public List<ConverterProcessResult> startConversion(Long
fileExplorerItemId, String moviePath) {
+ public List<ConverterProcessResult> startConversion(Long fileId, String
moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
- FileExplorerItem fileExplorerItem =
fileExplorerItemDaoImpl.get(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem =
fileExplorerItemDaoImpl.get(fileId);
log.debug("fileExplorerItem " +
fileExplorerItem.getId());
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Thu Nov 26 04:09:04 2015
@@ -134,12 +134,12 @@ public class FileProcessor {
}
}
- Long fileExplorerItemId = fileExplorerItemDao.add(
+ Long fileId = fileExplorerItemDao.add(
fileSystemName, fileHashName, // The Hashname of the file
parentFolderId, ownerId, roomId, userId, false, // isFolder
isImage, isPresentation, "", false, isChart,
externalFileId, externalType);
- log.debug("fileExplorerItemId: " + fileExplorerItemId);
+ log.debug("fileId: " + fileId);
@@ -161,7 +161,7 @@ public class FileProcessor {
ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, completeName, 50);
returnError.addItem("processThumb", processThumb);
} else if (isVideo) {
- List<ConverterProcessResult> returnList =
flvExplorerConverter.startConversion(fileExplorerItemId,
completeName.getCanonicalPath());
+ List<ConverterProcessResult> returnList =
flvExplorerConverter.startConversion(fileId, completeName.getCanonicalPath());
int i=0;
for (ConverterProcessResult returnMap : returnList) {
@@ -173,7 +173,7 @@ public class FileProcessor {
// has to happen at the end, otherwise it will be overwritten
//cause the variable is new initialized
returnError.setCompleteName(completeName.getName());
- returnError.setFileExplorerItemId(fileExplorerItemId);
+ returnError.setFileExplorerItemId(fileId);
return returnError;
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Thu Nov 26 04:09:04 2015
@@ -162,12 +162,11 @@ public class ConferenceLibrary implement
*
* @param SID
* @param room_id
- * @param fileExplorerItemId
+ * @param fileId
* @param whiteboardId
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public void loadWmlObject(String SID, Long room_id,
- Long fileExplorerItemId, Long whiteboardId) {
+ public void loadWmlObject(String SID, Long room_id, Long fileId, Long
whiteboardId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -181,7 +180,7 @@ public class ConferenceLibrary implement
return;
}
- FileExplorerItem fileExplorerItem =
fileExplorerItemDao.get(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem =
fileExplorerItemDao.get(fileId);
ArrayList roomItems =
libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath());
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
Thu Nov 26 04:09:04 2015
@@ -119,10 +119,10 @@ public class DownloadHandler extends Bas
requestedFile = "";
}
- String fileExplorerItemIdParam =
request.getParameter("fileExplorerItemId");
- Long fileExplorerItemId = null;
- if (fileExplorerItemIdParam != null) {
- fileExplorerItemId =
Long.parseLong(fileExplorerItemIdParam);
+ String fileIdParam =
request.getParameter("fileId");
+ Long fileId = null;
+ if (fileIdParam != null) {
+ fileId = Long.parseLong(fileIdParam);
}
@@ -253,8 +253,8 @@ public class DownloadHandler extends Bas
response.setContentType("APPLICATION/OCTET-STREAM");
String fileNameResult =
requestedFile;
- if (fileExplorerItemId != null
&& fileExplorerItemId > 0) {
- FileExplorerItem
fileExplorerItem = getBean(FileExplorerItemDao.class).get(fileExplorerItemId);
+ if (fileId != null && fileId >
0) {
+ FileExplorerItem
fileExplorerItem = getBean(FileExplorerItemDao.class).get(fileId);
if (fileExplorerItem !=
null) {
fileNameResult
= fileExplorerItem.getName().substring(0, fileExplorerItem.getName().length()-4)
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
Thu Nov 26 04:09:04 2015
@@ -193,21 +193,6 @@ public class RecordingDao {
}
}
- /**
- * @param fileExplorerItemId
- */
- public boolean delete(Long id) {
- try {
-
- Recording f = get(id);
- return delete(f);
- } catch (Exception ex2) {
- log.error("[delete]: ", ex2);
- }
-
- return false;
- }
-
public boolean delete(Recording f) {
if (f == null || f.getId() == null) {
return false;
Modified:
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
(original)
+++
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
Thu Nov 26 04:09:04 2015
@@ -82,7 +82,7 @@ public class RecordingWebService {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
- recordingDao.delete(id);
+ recordingDao.delete(recordingDao.get(id));
} else {
throw new ServiceException("Not allowed to
preform that action, Authenticate the SID first");
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Thu Nov 26 04:09:04 2015
@@ -56,10 +56,10 @@ public class FlvExplorerConverter extend
public int height = 0;
}
- public List<ConverterProcessResult> startConversion(Long
fileExplorerItemId, String moviePath) {
+ public List<ConverterProcessResult> startConversion(Long fileId, String
moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
- FileExplorerItem fileExplorerItem =
fileExplorerItemDaoImpl.get(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem =
fileExplorerItemDaoImpl.get(fileId);
log.debug("fileExplorerItem " +
fileExplorerItem.getId());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Thu Nov 26 04:09:04 2015
@@ -134,12 +134,12 @@ public class FileProcessor {
}
}
- Long fileExplorerItemId = fileExplorerItemDao.add(
+ Long fileId = fileExplorerItemDao.add(
fileSystemName, fileHashName, // The Hashname of the file
parentFolderId, ownerId, roomId, userId, false, // isFolder
isImage, isPresentation, "", false, isChart,
externalFileId, externalType);
- log.debug("fileExplorerItemId: " + fileExplorerItemId);
+ log.debug("fileId: " + fileId);
@@ -161,7 +161,7 @@ public class FileProcessor {
ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, completeName, 50);
returnError.addItem("processThumb", processThumb);
} else if (isVideo) {
- List<ConverterProcessResult> returnList =
flvExplorerConverter.startConversion(fileExplorerItemId,
completeName.getCanonicalPath());
+ List<ConverterProcessResult> returnList =
flvExplorerConverter.startConversion(fileId, completeName.getCanonicalPath());
int i=0;
for (ConverterProcessResult returnMap : returnList) {
@@ -173,7 +173,7 @@ public class FileProcessor {
// has to happen at the end, otherwise it will be overwritten
//cause the variable is new initialized
returnError.setCompleteName(completeName.getName());
- returnError.setFileExplorerItemId(fileExplorerItemId);
+ returnError.setFileExplorerItemId(fileId);
return returnError;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Thu Nov 26 04:09:04 2015
@@ -162,12 +162,11 @@ public class ConferenceLibrary implement
*
* @param SID
* @param room_id
- * @param fileExplorerItemId
+ * @param fileId
* @param whiteboardId
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- public void loadWmlObject(String SID, Long room_id,
- Long fileExplorerItemId, Long whiteboardId) {
+ public void loadWmlObject(String SID, Long room_id, Long fileId, Long
whiteboardId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -181,7 +180,7 @@ public class ConferenceLibrary implement
return;
}
- FileExplorerItem fileExplorerItem =
fileExplorerItemDao.get(fileExplorerItemId);
+ FileExplorerItem fileExplorerItem =
fileExplorerItemDao.get(fileId);
ArrayList roomItems =
libraryWmlLoader.loadWmlFile(fileExplorerItem.getWmlFilePath());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
Thu Nov 26 04:09:04 2015
@@ -193,21 +193,6 @@ public class RecordingDao {
}
}
- /**
- * @param fileExplorerItemId
- */
- public boolean delete(Long id) {
- try {
-
- Recording f = get(id);
- return delete(f);
- } catch (Exception ex2) {
- log.error("[delete]: ", ex2);
- }
-
- return false;
- }
-
public boolean delete(Recording f) {
if (f == null || f.getId() == null) {
return false;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java?rev=1716564&r1=1716563&r2=1716564&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
Thu Nov 26 04:09:04 2015
@@ -82,7 +82,7 @@ public class RecordingWebService {
Long userId = sessionDao.checkSession(sid);
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
- recordingDao.delete(id);
+ recordingDao.delete(recordingDao.get(id));
} else {
throw new ServiceException("Not allowed to
preform that action, Authenticate the SID first");
}
