This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 94cf502 [OPENMEETINGS-2427] sonar should be more happy
94cf502 is described below
commit 94cf5026c3bbc86bff215e7d07b2a2f90c65acfd
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Sep 13 23:00:44 2020 +0700
[OPENMEETINGS-2427] sonar should be more happy
---
.../apache/openmeetings/core/notifier/NotifierService.java | 4 ++--
.../org/apache/openmeetings/db/util/AuthLevelUtil.java | 2 +-
.../org/apache/openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../java/org/apache/openmeetings/web/app/WebSession.java | 8 ++++----
.../java/org/apache/openmeetings/web/common/MainPanel.java | 4 ++--
.../openmeetings/web/common/tree/OmTreeProvider.java | 14 +++++++-------
.../web/user/profile/MessagesContactsPanel.java | 14 +++++++-------
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
index c337b5a..bab79ea 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
@@ -45,8 +45,8 @@ public class NotifierService {
public void notify(User u, Appointment a, Invitation inv) {
if (inv == null) {
- log.error(String.format("Error retrieving Invitation
for member %s in Appointment %s"
- , u.getAddress().getEmail(),
a.getTitle()));
+ log.error("Error retrieving Invitation for member {} in
Appointment {}"
+ , u.getAddress().getEmail(),
a.getTitle());
return;
}
for (INotifier n : notifiers) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
index bd20559..42acbb7 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
@@ -37,7 +37,7 @@ public class AuthLevelUtil {
public static boolean check(Set<User.Right> rights, User.Right level) {
boolean result = rights.contains(level);
- log.debug(String.format("Level %s :: %s", level, result ?
"[GRANTED]" : "[DENIED]"));
+ log.debug("Level {} :: {}", level, result ? "[GRANTED]" :
"[DENIED]");
return result;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index f700310..128f26f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -205,7 +205,7 @@ public class RoomForm extends AdminBaseForm<Room> {
public RoomGroup fromId(String inId) {
Long id = Long.valueOf(inId);
- if (!orgList.stream().anyMatch(g ->
g.getId().equals(id))) {
+ if (orgList.stream().noneMatch(g ->
g.getId().equals(id))) {
return null; // seems to be hacked
}
Group g = groupDao.get(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 5349aa9..f59f17d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -111,7 +111,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
private OmUrlFragment area = null;
private TimeZone tz;
private TimeZone browserTz;
- private FastDateFormat ISO8601FORMAT = null;
+ private FastDateFormat iso8601Format = null;
private FastDateFormat sdf = null;
private UserDashboard dashboard;
private Invitation i = null;
@@ -150,7 +150,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
super.invalidate();
userId = null;
rights =
Collections.unmodifiableSet(Collections.<Right>emptySet());
- ISO8601FORMAT = null;
+ iso8601Format = null;
sdf = null;
languageId = -1;
i = null;
@@ -352,7 +352,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
}
languageId = u.getLanguageId();
tz = getTimeZone(u);
- ISO8601FORMAT =
FastDateFormat.getInstance(ISO8601_FULL_FORMAT_STRING, tz);
+ iso8601Format =
FastDateFormat.getInstance(ISO8601_FULL_FORMAT_STRING, tz);
setLocale(LocaleHelper.getLocale(u));
sdf = FormatHelper.getDateTimeFormat(u);
}
@@ -445,7 +445,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
}
public static FastDateFormat getIsoDateFormat() {
- return get().ISO8601FORMAT;
+ return get().iso8601Format;
}
public static FastDateFormat getDateFormat() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index a350ea8..edf25a4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -95,7 +95,7 @@ import
de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptRefe
public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(MainPanel.class);
- private final WebMarkupContainer EMPTY = new
WebMarkupContainer(CHILD_ID);
+ private final WebMarkupContainer empty = new
WebMarkupContainer(CHILD_ID);
private String uid = null;
private MenuPanel menu;
private final WebMarkupContainer topControls = new
WebMarkupContainer("topControls");
@@ -192,7 +192,7 @@ public class MainPanel extends Panel {
});
menu = new MenuPanel("menu", getMainMenu());
add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
- add(contents.add(getClient() == null || panel == null ? EMPTY :
panel).setOutputMarkupId(true).setMarkupId("contents"));
+ add(contents.add(getClient() == null || panel == null ? empty :
panel).setOutputMarkupId(true).setMarkupId("contents"));
topControls.add(menu.setVisible(false),
topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
final AboutDialog about = new AboutDialog("aboutDialog");
topLinks.add(new AjaxLink<Void>("about") {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
index 3f49d40..48790f6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
@@ -53,7 +53,7 @@ public class OmTreeProvider implements
ITreeProvider<BaseFileItem> {
public static final String FILES_GROUP = "files-group-%s";
private final Long roomId;
private final List<BaseFileItem> roots = new ArrayList<>();
- private final String PUBLIC, GROUP_FILE, GROUP_REC;
+ private final String lblPublic, lblGroupFile, lblGroupRec;
@SpringBean
private UserDao userDao;
@SpringBean
@@ -64,9 +64,9 @@ public class OmTreeProvider implements
ITreeProvider<BaseFileItem> {
public OmTreeProvider(Long roomId) {
Injector.get().inject(this);
this.roomId = roomId;
- PUBLIC = Application.getString("861");
- GROUP_FILE = Application.getString("files.root.group");
- GROUP_REC = Application.getString("recordings.root.group");
+ lblPublic = Application.getString("861");
+ lblGroupFile = Application.getString("files.root.group");
+ lblGroupRec = Application.getString("recordings.root.group");
refreshRoots(true);
}
@@ -89,7 +89,7 @@ public class OmTreeProvider implements
ITreeProvider<BaseFileItem> {
rRoot.add(r);
}
{
- BaseFileItem r = createRoot(PUBLIC,
RECORDINGS_PUBLIC, true);
+ BaseFileItem r = createRoot(lblPublic,
RECORDINGS_PUBLIC, true);
rRoot.add(r);
}
}
@@ -97,12 +97,12 @@ public class OmTreeProvider implements
ITreeProvider<BaseFileItem> {
Group g = gu.getGroup();
boolean readOnly = g.isRestricted() &&
!hasAdminLevel(getRights()) && !gu.isModerator();
if (all) {
- BaseFileItem r = createRoot(String.format("%s
(%s)", GROUP_REC, g.getName()), String.format(RECORDINGS_GROUP, g.getId()),
true);
+ BaseFileItem r = createRoot(String.format("%s
(%s)", lblGroupRec, g.getName()), String.format(RECORDINGS_GROUP, g.getId()),
true);
r.setReadOnly(readOnly);
r.setGroupId(g.getId());
rRoot.add(r);
}
- BaseFileItem r = createRoot(String.format("%s (%s)",
GROUP_FILE, g.getName()), String.format(FILES_GROUP, g.getId()), false);
+ BaseFileItem r = createRoot(String.format("%s (%s)",
lblGroupFile, g.getName()), String.format(FILES_GROUP, g.getId()), false);
r.setGroupId(g.getId());
//group videos are read-only in recordings tree
r.setReadOnly(roomId == null || readOnly);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index b60c3dc..285b5de 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -131,9 +131,9 @@ public class MessagesContactsPanel extends UserBasePanel {
return object;
}
});
- private PrivateMessageFolder NOT_MOVE_FOLDER = new
PrivateMessageFolder();
- private final DropDownChoice<PrivateMessageFolder> moveDropDown = new
DropDownChoice<>("msgMove", Model.of(NOT_MOVE_FOLDER)
- , List.of(NOT_MOVE_FOLDER)
+ private final PrivateMessageFolder notMoveFolder = new
PrivateMessageFolder();
+ private final DropDownChoice<PrivateMessageFolder> moveDropDown = new
DropDownChoice<>("msgMove", Model.of(notMoveFolder)
+ , List.of(notMoveFolder)
, new ChoiceRenderer<PrivateMessageFolder>() {
private static final long serialVersionUID = 1L;
@@ -159,8 +159,8 @@ public class MessagesContactsPanel extends UserBasePanel {
public MessagesContactsPanel(String id) {
super(id);
- NOT_MOVE_FOLDER.setId(MOVE_CHOOSE);
- NOT_MOVE_FOLDER.setFolderName(Application.getString("1243"));
+ notMoveFolder.setId(MOVE_CHOOSE);
+ notMoveFolder.setFolderName(Application.getString("1243"));
foldersModel.setObject(folderDao.get(0, Integer.MAX_VALUE));
updateMoveModel();
@@ -585,7 +585,7 @@ public class MessagesContactsPanel extends UserBasePanel {
selectFolder(folder);
emptySelection(target);
selectDropDown.setModelObject(SELECT_CHOOSE);
- moveDropDown.setModelObject(NOT_MOVE_FOLDER);
+ moveDropDown.setModelObject(notMoveFolder);
deleteBtn.add(AttributeModifier.replace("value",
Application.getString(TRASH_FOLDER_ID.equals(id) ? "1256" : "80")));
readBtn.setEnabled(false);
unreadBtn.setEnabled(false);
@@ -608,7 +608,7 @@ public class MessagesContactsPanel extends UserBasePanel {
private void updateMoveModel() {
List<PrivateMessageFolder> list = new ArrayList<>();
- list.add(NOT_MOVE_FOLDER);
+ list.add(notMoveFolder);
list.addAll(foldersModel.getObject());
moveDropDown.setChoices(list);
}
