Repository: openmeetings Updated Branches: refs/heads/master 97edf43ea -> cad42a08d
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cad42a08 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cad42a08 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cad42a08 Branch: refs/heads/master Commit: cad42a08daf5e4e91ccc915f6c230e51cd7e18f1 Parents: 97edf43 Author: Maxim Solodovnik <[email protected]> Authored: Sat Oct 7 22:56:08 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Oct 7 22:56:08 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/db/dao/IDataProviderDao.java | 1 + .../apache/openmeetings/db/dao/label/LabelDao.java | 16 ++++++++-------- .../openmeetings/db/dao/user/GroupUserDao.java | 12 ++++++------ .../openmeetings/db/dao/user/PrivateMessageDao.java | 8 ++++---- .../db/dao/user/PrivateMessageFolderDao.java | 6 +++--- .../openmeetings/db/entity/file/BaseFileItem.java | 13 +++++++------ .../apache/openmeetings/backup/BackupImport.java | 5 +++-- .../org/apache/openmeetings/util/OmFileHelper.java | 3 ++- .../org/apache/openmeetings/util/StoredFile.java | 3 ++- .../apache/openmeetings/web/common/tree/filetree.js | 2 +- .../openmeetings/core/file/TestFileProcessor.java | 3 ++- 11 files changed, 39 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java index e9ca246..3263652 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/IDataProviderDao.java @@ -30,6 +30,7 @@ import org.apache.openmeetings.db.entity.IDataProviderEntity; * @param <T> */ public interface IDataProviderDao<T extends IDataProviderEntity> { + static final UnsupportedOperationException UNSUPPORTED = new UnsupportedOperationException("Should not be used"); /** * Get an instance of an {@link T} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index e0296da..04ba58b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -190,22 +190,22 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public StringLabel get(long id) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public StringLabel get(Long id) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public List<StringLabel> get(int start, int count) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public List<StringLabel> get(String search, int start, int count, String order) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public static Locale getLocale(Long id) { @@ -237,12 +237,12 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public long count() { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count(String search) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public static long count(Locale l, final String search) { @@ -251,7 +251,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public StringLabel update(StringLabel entity, Long userId) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public static StringLabel update(Locale l, StringLabel entity) throws Exception { @@ -266,7 +266,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public void delete(StringLabel entity, Long userId) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public static void delete(Locale l, StringLabel entity) throws Exception { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java index 4c80342..54fc299 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java @@ -51,12 +51,12 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public List<GroupUser> get(int start, int count) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public List<GroupUser> get(String search, int start, int count, String sort) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public List<GroupUser> get(long groupId, String search, int start, int count, String sort) { @@ -88,12 +88,12 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public long count() { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count(String search) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } public long count(long groupId, String search) { @@ -109,11 +109,11 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public GroupUser update(GroupUser entity, Long userId) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public void delete(GroupUser entity, Long userId) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index df6491b..5bd33ae 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -181,21 +181,21 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { @Override public List<PrivateMessage> get(String search, int start, int count, String order) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count() { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count(String search) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public void delete(PrivateMessage entity, Long userId) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index 27d5662..32228da 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -105,16 +105,16 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF @Override public List<PrivateMessageFolder> get(String search, int start, int count, String order) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count() { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } @Override public long count(String search) { - throw new UnsupportedOperationException("Should not be used"); + throw UNSUPPORTED; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java index 33f7e74..bf24fae 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WML; +import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT; import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadFilesDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadWmlDir; @@ -261,7 +262,7 @@ public abstract class BaseFileItem implements IDataProviderEntity { } public String getFileName(String ext) { - return ext == null ? name : String.format("%s.%s", name, ext); + return ext == null ? name : String.format(FILE_NAME_FMT, name, ext); } public File getFile() { @@ -298,16 +299,16 @@ public abstract class BaseFileItem implements IDataProviderEntity { File d = new File(getUploadFilesDir(), getHash()); switch (getType()) { case WmlFile: - f = new File(getUploadWmlDir(), String.format("%s.%s", getHash(), ext == null ? EXTENSION_WML : ext)); + f = new File(getUploadWmlDir(), String.format(FILE_NAME_FMT, getHash(), ext == null ? EXTENSION_WML : ext)); break; case Image: - f = new File(d, String.format("%s.%s", getHash(), ext == null ? EXTENSION_JPG : ext)); + f = new File(d, String.format(FILE_NAME_FMT, getHash(), ext == null ? EXTENSION_JPG : ext)); break; case Recording: - f = new File(getStreamsHibernateDir(), String.format("%s.%s", getHash(), ext == null ? EXTENSION_MP4 : ext)); + f = new File(getStreamsHibernateDir(), String.format(FILE_NAME_FMT, getHash(), ext == null ? EXTENSION_MP4 : ext)); break; case Video: - f = new File(d, String.format("%s.%s", getHash(), ext == null ? EXTENSION_MP4 : ext)); + f = new File(d, String.format(FILE_NAME_FMT, getHash(), ext == null ? EXTENSION_MP4 : ext)); break; case Presentation: int slide; @@ -324,7 +325,7 @@ public abstract class BaseFileItem implements IDataProviderEntity { if (slide > -1) { f = new File(d, String.format("%1$s-%2$04d.%3$s", DOC_PAGE_PREFIX, slide, EXTENSION_PNG)); } else { - f = new File(d, String.format("%s.%s", getHash(), ext == null ? EXTENSION_PDF : ext)); + f = new File(d, String.format(FILE_NAME_FMT, getHash(), ext == null ? EXTENSION_PDF : ext)); } break; case PollChart: http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index d038603..d685292 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -29,6 +29,7 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; import static org.apache.openmeetings.util.OmFileHelper.FILES_DIR; +import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT; import static org.apache.openmeetings.util.OmFileHelper.PROFILES_DIR; import static org.apache.openmeetings.util.OmFileHelper.getFileName; import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir; @@ -719,8 +720,8 @@ public class BackupImport { if (!Strings.isEmpty(r.getHash()) && r.getHash().startsWith(recordingFileName)) { String name = getFileName(r.getHash()); r.setHash(UUID.randomUUID().toString()); - fileMap.put(String.format("%s.%s", name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_PNG)); - fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(), EXTENSION_MP4)); + fileMap.put(String.format(FILE_NAME_FMT, name, EXTENSION_JPG), String.format(FILE_NAME_FMT, r.getHash(), EXTENSION_PNG)); + fileMap.put(String.format("%s.%s.%s", name, EXTENSION_FLV, EXTENSION_MP4), String.format(FILE_NAME_FMT, r.getHash(), EXTENSION_MP4)); } if (Strings.isEmpty(r.getHash())) { r.setHash(UUID.randomUUID().toString()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java index d4138c2..a0b109f 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java @@ -41,6 +41,7 @@ public class OmFileHelper { private static final String IMAGES_DIR = "images"; private static final String WML_DIR = "stored"; + public static final String FILE_NAME_FMT = "%s.%s"; public static final String BACKUP_DIR = "backup"; public static final String IMPORT_DIR = "import"; public static final String PROFILES_DIR = "profiles"; @@ -194,7 +195,7 @@ public class OmFileHelper { } public static String getName(String name, String ext) { - return String.format("%s.%s", name, ext); + return String.format(FILE_NAME_FMT, name, ext); } public static File getRecordingMetaData(Long roomId, String name) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java index 7b03ca0..4a95eb6 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.util; +import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; import static org.apache.openmeetings.util.OmFileHelper.getFileExt; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; @@ -105,7 +106,7 @@ public class StoredFile { } Tika tika = new Tika(); Metadata md = new Metadata(); - md.add(RESOURCE_NAME_KEY, String.format("%s.%s", name, ext)); + md.add(RESOURCE_NAME_KEY, String.format(FILE_NAME_FMT, name, ext)); try { mime = MediaType.parse(tika.detect(is, md)); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js index 3a0ea76..45d6b5e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js @@ -5,7 +5,7 @@ function dragHelper() { s = $('.ui-state-active .ui-draggable.ui-draggable-handle'); } const c = $('<div/>').attr('id', 'draggingContainer').width(80).height(36) - h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width()); + , h = $('<div class="ui-corner-all ui-widget-header"/>').append(s.clone()).width(s.width()); return c.append(h); } function treeRevert(dropped) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cad42a08/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java index c3fe9d0..a9eb226 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.core.file; +import static org.apache.openmeetings.util.OmFileHelper.FILE_NAME_FMT; import static org.apache.openmeetings.util.OmFileHelper.getDefaultProfilePicture; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -45,7 +46,7 @@ public class TestFileProcessor extends AbstractJUnitDefaults { public void testProcessJpeg() throws Exception { for (String ext : new String[] {null, "txt", "png"}) { FileItem f = new FileItemDTO() - .setName(String.format("%s.%s", FILE_NAME, ext)) + .setName(String.format(FILE_NAME_FMT, FILE_NAME, ext)) .setHash(UUID.randomUUID().toString()) .setType(BaseFileItem.Type.Recording).get(); try (InputStream is = new FileInputStream(getDefaultProfilePicture())) {
