Repository: openmeetings Updated Branches: refs/heads/master 4cd226530 -> 93816cbe1
[OPENMEETINGS-1714] some warnings are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/93816cbe Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/93816cbe Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/93816cbe Branch: refs/heads/master Commit: 93816cbe14bc963359435b79c5ac76e7132bc410 Parents: 4cd2265 Author: Maxim Solodovnik <[email protected]> Authored: Thu Sep 28 23:12:31 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Sep 28 23:12:31 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/ldap/LdapOptions.java | 6 ++-- .../openmeetings/db/dao/label/LabelDao.java | 16 ++++----- .../openmeetings/db/dao/room/RoomDao.java | 9 ++--- .../openmeetings/db/dao/room/RoomGroupDao.java | 5 +-- .../openmeetings/db/dao/user/GroupUserDao.java | 25 +++++--------- .../db/dao/user/PrivateMessageDao.java | 8 ++--- .../db/dao/user/PrivateMessageFolderDao.java | 6 ++-- .../openmeetings/db/dao/user/UserDao.java | 35 ++++++-------------- .../openmeetings/db/util/LocaleHelper.java | 4 +-- .../openmeetings/db/util/TimezoneUtil.java | 2 +- .../AppointmentReminderTypeConverter.java | 1 + .../openmeetings/service/user/UserManager.java | 2 +- .../openmeetings/util/CalendarPatterns.java | 2 +- 13 files changed, 47 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java index 26b468c..9e3f354 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java @@ -83,21 +83,21 @@ public class LdapOptions { try { type = AuthType.valueOf(ldap_auth_type); } catch (Exception e) { - log.error(String.format("ConfigKey in Ldap Config contains invalid auth type : '%s' -> Defaulting to %s", ldap_auth_type, type)); + log.error("ConfigKey in Ldap Config contains invalid auth type : '{}' -> Defaulting to {}", ldap_auth_type, type); } String ldap_prov_type = config.getProperty(CONFIGKEY_LDAP_PROV_TYPE, ""); try { prov = Provisionning.valueOf(ldap_prov_type); } catch (Exception e) { - log.error(String.format("ConfigKey in Ldap Config contains invalid provisionning type : '%s' -> Defaulting to %s", ldap_prov_type, prov)); + log.error("ConfigKey in Ldap Config contains invalid provisionning type : '{}' -> Defaulting to {}", ldap_prov_type, prov); } String ldap_deref_mode = config.getProperty(CONFIGKEY_LDAP_DEREF_MODE, ""); try { derefMode = AliasDerefMode.getDerefMode(ldap_deref_mode); } catch (Exception e) { - log.error(String.format("ConfigKey in Ldap Config contains invalid deref mode : '%s' -> Defaulting to %s", ldap_deref_mode, derefMode)); + log.error("ConfigKey in Ldap Config contains invalid deref mode : '{}' -> Defaulting to {}", ldap_deref_mode, derefMode); } if (AuthType.NONE == type && Provisionning.NONE == prov) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/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 d9257f9..524785d 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 @@ -197,22 +197,22 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public StringLabel get(long id) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public StringLabel get(Long id) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public List<StringLabel> get(int start, int count) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public List<StringLabel> get(String search, int start, int count, String order) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public static List<StringLabel> get(Locale l, final String search, int start, int count, final SortParam<String> sort) { @@ -225,12 +225,12 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public long count() { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count(String search) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public static long count(Locale l, final String search) { @@ -239,7 +239,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public StringLabel update(StringLabel entity, Long userId) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public static StringLabel update(Locale l, StringLabel entity) throws Exception { @@ -254,7 +254,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public void delete(StringLabel entity, Long userId) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public static void delete(Locale l, StringLabel entity) throws Exception { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index 8955ea9..e232fd9 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -253,7 +253,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { log.debug("getUserRoom : " + ownerId + " || " + type); Room room = null; List<Room> ll = em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class).setParameter("ownerId", ownerId).setParameter("type", type).getResultList(); - if (ll.size() > 0) { + if (!ll.isEmpty()) { room = ll.get(0); } @@ -286,12 +286,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> { .setParameter("externalType", externalType) .setParameter("type", type) .getResultList(); - if (ll.size() > 0) { - return ll.get(0); - } else { - log.error("Could not find room " + externalId); - return null; - } + return ll.isEmpty() ? null : ll.get(0); } public List<Room> getRecent(Long userId) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java index 155b5e9..b9f318e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java @@ -58,9 +58,6 @@ public class RoomGroupDao { .setParameter("groupId", groupId) .getResultList(); - if (ll.size() > 0) { - return ll.get(0); - } - return null; + return ll.isEmpty() ? null : ll.get(0); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/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 67b53dc..a9cacbd 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 RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public List<GroupUser> get(String search, int start, int count, String sort) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public List<GroupUser> get(long groupId, String search, int start, int count, String sort) { @@ -76,16 +76,9 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { } public GroupUser getByGroupAndUser(Long groupId, Long userId) { - try { - List<GroupUser> list = em.createNamedQuery("isUserInGroup", GroupUser.class) - .setParameter("groupId", groupId).setParameter("userId", userId).getResultList(); - if (list != null && !list.isEmpty()) { - return list.get(0); - } - } catch (Exception e) { - //no-op - } - return null; + List<GroupUser> list = em.createNamedQuery("isUserInGroup", GroupUser.class) + .setParameter("groupId", groupId).setParameter("userId", userId).getResultList(); + return list.isEmpty() ? null : list.get(0); } public boolean isUserInGroup(long groupId, long userId) { @@ -95,12 +88,12 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public long count() { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count(String search) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } public long count(long groupId, String search) { @@ -116,11 +109,11 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public GroupUser update(GroupUser entity, Long userId) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public void delete(GroupUser entity, Long userId) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/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 774baea..4af7756 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 @@ -178,21 +178,21 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { @Override public List<PrivateMessage> get(String search, int start, int count, String order) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count() { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count(String search) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public void delete(PrivateMessage entity, Long userId) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/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 bf3a13e..2afb284 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 @@ -120,16 +120,16 @@ public class PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageF @Override public List<PrivateMessageFolder> get(String search, int start, int count, String order) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count() { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } @Override public long count(String search) { - throw new RuntimeException("Should not be used"); + throw new UnsupportedOperationException("Should not be used"); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index 80bff18..a5a95ee 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -355,13 +355,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { * @return */ public boolean checkLogin(String login, Type type, Long domainId, Long id) { - try { - User u = getByLogin(login, type, domainId); - return u == null || u.getId().equals(id); - } catch (Exception e) { - //exception is thrown in case of non-unique result - return false; - } + User u = getByLogin(login, type, domainId); + return u == null || u.getId().equals(id); } /** @@ -375,13 +370,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { */ public boolean checkEmail(String email, Type type, Long domainId, Long id) { log.debug("checkEmail: email = {}, id = {}", email, id); - try { - User u = getByEmail(email, type, domainId); - return u == null || u.getId().equals(id); - } catch (Exception e) { - //exception is thrown in case of non-unique result - } - return false; + User u = getByEmail(email, type, domainId); + return u == null || u.getId().equals(id); } public boolean validLogin(String login) { @@ -493,15 +483,11 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { } public User getContact(String email, String firstName, String lastName, Long langId, String tzId, User owner) { - User to = null; - try { - to = em.createNamedQuery("getContactByEmailAndUser", User.class) - .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getId()).getSingleResult(); - } catch (Exception e) { - //no-op - } - if (to == null) { - to = new User(); + List<User> list = em.createNamedQuery("getContactByEmailAndUser", User.class) + .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getId()) + .getResultList(); + if (list.isEmpty()) { + User to = new User(); to.setType(Type.contact); String login = owner.getId() + "_" + email; //UserId prefix is used to ensure unique login to.setLogin(login.length() < getMinLoginLength(cfgDao) ? UUID.randomUUID().toString() : login); @@ -512,8 +498,9 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { to.setAddress(new Address()); to.getAddress().setEmail(email); to.setTimeZoneId(Strings.isEmpty(tzId) ? owner.getTimeZoneId() : tzId); + return to; } - return to; + return list.get(0); } /** http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java index 43bb513..66f588f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java @@ -45,10 +45,10 @@ public class LocaleHelper { return new Locale.Builder().setRegion(code).build().getDisplayCountry(); } - public static String validateCountry(String code) { + public static String validateCountry(String _code) { List<String> list = getCountries(); Set<String> countries = new HashSet<>(list); - code = code == null ? "" : code.toUpperCase(); + String code = _code == null ? "" : _code.toUpperCase(); if (!countries.contains(code)) { String newCountry = list.get(0); log.warn("Invalid country found: {}, will be replaced with: {}", code, newCountry); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java index efa2254..87c3c06 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java @@ -105,6 +105,6 @@ public class TimezoneUtil { public static long _getOffset(TimeZone timezone) { Calendar cal = Calendar.getInstance(); cal.setTimeZone(timezone); - return cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET); + return (long)cal.get(Calendar.ZONE_OFFSET) + cal.get(Calendar.DST_OFFSET); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java index 9e7020b..f55d7fe 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java @@ -24,6 +24,7 @@ import org.simpleframework.xml.stream.OutputNode; public class AppointmentReminderTypeConverter extends OmConverter<Reminder> { public AppointmentReminderTypeConverter() { + //default constructor is for export } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index 6453e17..3a7adbc 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -228,7 +228,7 @@ public class UserManager implements IUserManager { } else { if (!checkName) { return "error.login.inuse"; - } else if (!checkEmail) { + } else { return "error.email.inuse"; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/93816cbe/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java index b03b348..152a72d 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java @@ -156,7 +156,7 @@ public class CalendarPatterns { public static Date parseDateWithHour(String dateString) { try { if (dateString == null || dateString.length() == 0 - || dateString.equals("null")) { + || "null".equals(dateString)) { return null; } return dateFormat__ddMMyyyyHHmmss.parse(dateString);
