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 ef91f39a3 [OPENMEETINGS-2758] some Sonar code smells are addressed
ef91f39a3 is described below
commit ef91f39a3f08d46a9c5b98c52094f90509e5dfb4
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Apr 28 15:47:14 2023 +0700
[OPENMEETINGS-2758] some Sonar code smells are addressed
---
.../java/org/apache/openmeetings/db/dto/basic/Health.java | 11 +++++++++--
.../apache/openmeetings/service/scheduler/ReminderJob.java | 2 +-
.../org/apache/openmeetings/web/admin/labels/LangPanel.java | 2 +-
.../apache/openmeetings/web/common/UploadableImagePanel.java | 2 +-
.../org/apache/openmeetings/web/common/upload/UploadForm.java | 2 +-
.../web/util/upload/BootstrapFileUploadBehavior.java | 9 ++++++++-
.../org/apache/openmeetings/webservice/InfoWebService.java | 2 +-
7 files changed, 22 insertions(+), 8 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Health.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Health.java
index 6f86f47b1..718802dfd 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Health.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Health.java
@@ -30,12 +30,19 @@ import javax.xml.bind.annotation.XmlRootElement;
@XmlAccessorType(XmlAccessType.FIELD)
public class Health implements Serializable {
private static final long serialVersionUID = 1L;
- public static final Health INSTANCE = new Health();
private boolean inited;
private boolean installed;
private boolean dbOk;
- public Health() {
+ private static class Holder {
+ private static final Health INSTANCE = new Health();
+ }
+
+ public static Health getInstance() {
+ return Holder.INSTANCE;
+ }
+
+ private Health() {
inited = isInitComplete();
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
index 6167681ec..7bfd134a6 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/ReminderJob.java
@@ -128,7 +128,7 @@ public class ReminderJob extends AbstractJob {
} catch (Exception e) {
log.error("DB seems to be down");
}
- Health.INSTANCE.setInited(isInitComplete())
+ Health.getInstance().setInited(isInitComplete())
.setInstalled(CryptProvider.get() != null)
.setDbOk(dbOk);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index 046938763..93060889d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -229,7 +229,7 @@ public class LangPanel extends AdminBasePanel {
addLang.show(target);
}
});
- add(BootstrapFileUploadBehavior.INSTANCE);
+ add(BootstrapFileUploadBehavior.getInstance());
final BootstrapAjaxButton delLngBtn = new
BootstrapAjaxButton("deleteLangBtn", Buttons.Type.Outline_Danger) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index c75aed681..621fc66c4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -102,7 +102,7 @@ public abstract class UploadableImagePanel extends
ImagePanel {
});
}
add(form.setOutputMarkupId(true));
- add(BootstrapFileUploadBehavior.INSTANCE);
+ add(BootstrapFileUploadBehavior.getInstance());
}
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
index 55737ef63..738441b05 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
@@ -77,7 +77,7 @@ public abstract class UploadForm extends Panel {
add(new WebMarkupContainer("progress-title")
.add(AttributeModifier.append("data-processing-lbl",
getString(processingLabelKey()))));
- add(BootstrapFileUploadBehavior.INSTANCE);
+ add(BootstrapFileUploadBehavior.getInstance());
super.onInitialize();
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
index 0595130be..ef100e0ed 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
@@ -34,7 +34,14 @@ public class BootstrapFileUploadBehavior extends Behavior {
= new
WebjarsJavaScriptResourceReference("/jasny-bootstrap/current/js/jasny-bootstrap.js");
private static final ResourceReference BOOTSTRAP_FILEINPUT_CSS_REFERENCE
= new
WebjarsCssResourceReference("/jasny-bootstrap/current/css/jasny-bootstrap.css");
- public static final BootstrapFileUploadBehavior INSTANCE = new
BootstrapFileUploadBehavior();
+
+ private static class Holder {
+ private static final BootstrapFileUploadBehavior INSTANCE = new
BootstrapFileUploadBehavior();
+ }
+
+ public static BootstrapFileUploadBehavior getInstance() {
+ return Holder.INSTANCE;
+ }
private BootstrapFileUploadBehavior() {
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
index cb6705401..662ec883e 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/InfoWebService.java
@@ -97,7 +97,7 @@ public class InfoWebService {
}
)
public Health getHealth() {
- return Health.INSTANCE;
+ return Health.getInstance();
}
@WebMethod
