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 83e3911f1 [OPENMEETINGS-2732] ical4j, tika-parsers, mockito, swagger
and plugins; code clean-up
83e3911f1 is described below
commit 83e3911f1fb433408a742b4eb2e125b320c64ff3
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Nov 11 12:31:58 2022 +0700
[OPENMEETINGS-2732] ical4j, tika-parsers, mockito, swagger and plugins;
code clean-up
---
.../openmeetings/core/util/WebSocketHelper.java | 4 ++-
openmeetings-db/pom.xml | 5 ++++
.../java/org/apache/openmeetings/IApplication.java | 3 ++-
.../openmeetings/db/entity/basic/Client.java | 3 +++
.../openmeetings/db/entity/basic/IWsClient.java | 4 ++-
.../openmeetings/db/entity/basic/WsClient.java | 3 +++
.../mediaserver/StreamProcessorActions.java | 4 ++-
.../mediaserver/TestSetupFlowMocked.java | 1 -
.../openmeetings/service/scheduler/AtomReader.java | 4 +--
.../openmeetings/util/process/ProcessHelper.java | 6 ++++-
openmeetings-web/pom.xml | 4 +--
.../apache/openmeetings/web/app/Application.java | 3 ++-
.../apache/openmeetings/web/app/WebSession.java | 2 +-
.../web/util/GroupLogoResourceReference.java | 2 +-
.../webservice/CalendarWebService.java | 8 ++----
pom.xml | 29 ++++++++++++++--------
16 files changed, 55 insertions(+), 30 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index fa40ac0b9..a8f3d9563 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -28,6 +28,8 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.util.ws.WsMessageAll;
import org.apache.openmeetings.core.util.ws.WsMessageRoom;
@@ -216,7 +218,7 @@ public class WebSocketHelper {
}).start();
}
- public static void publish(IClusterWsMessage m) {
+ public static void publish(@Nonnull IClusterWsMessage m) {
IApplication app = getApp();
new Thread(() -> app.publishWsTopic(m)).start();
}
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 9e754e4ed..b6fd3e83f 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -91,6 +91,11 @@
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc10</artifactId>
</dependency>
+ <dependency>
+ <!-- required for @NonNull, temporary -->
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId>
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
index 45f9f914f..d078f2945 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
@@ -22,6 +22,7 @@ import java.util.Locale;
import java.util.Set;
import java.util.function.Supplier;
+import javax.annotation.Nonnull;
import javax.servlet.ServletContext;
import org.apache.openmeetings.db.entity.room.Invitation;
@@ -48,7 +49,7 @@ public interface IApplication {
void updateJpaAddresses();
//WS
- void publishWsTopic(IClusterWsMessage msg);
+ void publishWsTopic(@Nonnull IClusterWsMessage msg);
Set<String> getWsUrls();
void updateTheme();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index 6d5d02090..eaabdea93 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -34,6 +34,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room;
@@ -122,6 +124,7 @@ public class Client implements IDataProviderEntity,
IWsClient {
}
@Override
+ @Nonnull
public String getUid() {
return uid;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
index be4148e07..550f305fc 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IWsClient.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.db.entity.basic;
import java.io.Serializable;
+import javax.annotation.Nonnull;
+
/**
* Necessary for temp clients being created on HashPage
*
@@ -28,7 +30,7 @@ import java.io.Serializable;
*
*/
public interface IWsClient extends Serializable {
- String getUid();
+ @Nonnull String getUid();
int getPageId();
String getSessionId();
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
index a015b5bef..894c3ae85 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/WsClient.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.db.entity.basic;
import static java.util.UUID.randomUUID;
+import javax.annotation.Nonnull;
+
/**
* Temporary class for test recording, will be unified
* @author solomax
@@ -48,6 +50,7 @@ public class WsClient implements IWsClient {
}
@Override
+ @Nonnull
public String getUid() {
return uid;
}
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java
index 159e8ec1c..787e9e08b 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/StreamProcessorActions.java
@@ -119,7 +119,9 @@ public class StreamProcessorActions {
}
});
} catch (KurentoServerException e) {
- sender.release();
+ if (sender != null) {
+ sender.release();
+ }
WebSocketHelper.sendClient(c,
StreamProcessor.newStoppedMsg(sd));
sendError(c, "Failed to start broadcast: " +
e.getMessage());
log.error("Failed to start broadcast", e);
diff --git
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java
index 13711b71a..ef6490c20 100644
---
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java
+++
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestSetupFlowMocked.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.apache.openmeetings.db.entity.basic.WsClient;
-import org.apache.openmeetings.mediaserver.KurentoHandler;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.kurento.client.MediaPipeline;
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
index 366e267e0..4d11f1a64 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/scheduler/AtomReader.java
@@ -86,8 +86,8 @@ public class AtomReader {
XMLEventReader reader =
inputFactory.createXMLEventReader(is);
int i = 0;
JSONObject obj = null;
- StringBuilder val = null;
- Spec spec = null;
+ StringBuilder val = new StringBuilder(); // for
NPE safety
+ Spec spec = new Spec(""); // for NPE safety
Field f = null;
while (reader.hasNext()) {
XMLEvent evt = reader.nextEvent();
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
index f9d8f50a6..a82acc997 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
@@ -136,9 +136,13 @@ public class ProcessHelper {
} catch (Throwable t) {
onException(t, start, res);
} finally {
- if (proc != null) {
+ if (errorWatcher != null) {
errorWatcher.finish();
+ }
+ if (inputWatcher != null) {
inputWatcher.finish();
+ }
+ if (proc != null) {
proc.destroy();
}
}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 45331cbcf..6799e47e8 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -44,8 +44,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>mysql</groupId>
-
<artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 467b20f32..8e941b21f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -44,6 +44,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.annotation.Nonnull;
import javax.websocket.WebSocketContainer;
import org.apache.openmeetings.IApplication;
@@ -659,7 +660,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
@Override
- public void publishWsTopic(IClusterWsMessage msg) {
+ public void publishWsTopic(@Nonnull IClusterWsMessage msg) {
hazelWsTopic.publish(msg);
}
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 a4df31819..ad7f43840 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
@@ -285,7 +285,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
log.debug("Do we have data for hash ? {}", (sd.getXml()
!= null));
if (sd.getXml() != null) {
RemoteSessionObject remoteUser =
RemoteSessionObject.fromString(sd.getXml());
- log.debug("Hash data was parsed successfuly ?
{}, containg exterlaId ? {}", (remoteUser != null),
!Strings.isEmpty(remoteUser.getExternalId()));
+ log.debug("Hash data was parsed successfuly;
containg exterlaId ? {}", !Strings.isEmpty(remoteUser.getExternalId()));
if
(!Strings.isEmpty(remoteUser.getExternalId())) {
Room r;
if
(Strings.isEmpty(soapLogin.getExternalRoomId()) ||
Strings.isEmpty(soapLogin.getExternalType())) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
index 060c8383e..23366bbc0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
@@ -86,7 +86,7 @@ public class GroupLogoResourceReference extends
FileSystemResourceReference {
Room r =
ws.getInvitation().getRoom() == null ? null :
roomDao.get(ws.getInvitation().getRoom().getId());
if (r != null && r.getGroups()
!= null) {
for (RoomGroup rg :
r.getGroups()) {
- if
(id.equals(rg.getGroup().getId())) {
+ if
(rg.getGroup().getId().equals(id)) {
allowed
= true;
break;
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
index 2af78edb3..38d29fa93 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
@@ -114,9 +114,7 @@ public class CalendarWebService extends BaseWebService {
, @Parameter(required = true, description = "end time")
@PathParam("end") @WebParam(name="end") Calendar end
) throws ServiceException
{
- log.debug("range : startdate - {} , enddate - {}"
- , start == null ? "" : start.getTime()
- , end == null ? "" : end.getTime());
+ log.debug("range : startdate - {} , enddate - {}",
start.getTime(), end.getTime());
return performCall(sid, User.Right.ROOM
, sd ->
AppointmentDTO.list(dao.getInRange(sd.getUserId(), start.getTime(),
end.getTime())));
}
@@ -153,9 +151,7 @@ public class CalendarWebService extends BaseWebService {
, @Parameter(required = true, description = "end time")
@PathParam("end") @WebParam(name="end") Calendar end
) throws ServiceException
{
- log.debug("rangeForUser : startdate - {} , enddate - {}"
- , start == null ? "" : start.getTime()
- , end == null ? "" : end.getTime());
+ log.debug("rangeForUser : startdate - {} , enddate - {}",
start.getTime(), end.getTime());
return performCall(sid, User.Right.SOAP
, sd ->
AppointmentDTO.list(dao.getInRange(userid, start.getTime(), end.getTime())));
}
diff --git a/pom.xml b/pom.xml
index 67f378a56..91e5581f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,9 +45,9 @@
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
<maven-site-plugin.version>4.0.0-M3</maven-site-plugin.version>
- <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
+ <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
-
<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version>
+
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
@@ -59,7 +59,7 @@
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.3.0</maven-dependency-plugin.version>
- <maven-bundle-plugin.version>5.1.4</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
<wagon-maven-plugin.version>2.0.2</wagon-maven-plugin.version>
@@ -70,11 +70,11 @@
<saxon.version>8.7</saxon.version>
<buildnumber-maven-plugin.version>3.0.0</buildnumber-maven-plugin.version>
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
- <keytool-maven-plugin.version>1.5</keytool-maven-plugin.version>
+ <keytool-maven-plugin.version>1.6</keytool-maven-plugin.version>
<maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
<sonar-maven-plugin.version>3.9.1.2184</sonar-maven-plugin.version>
<jacoco-maven-plugin.versoin>0.8.8</jacoco-maven-plugin.versoin>
- <forbiddenapis.version>3.3</forbiddenapis.version>
+ <forbiddenapis.version>3.4</forbiddenapis.version>
<maven-checkstyle-plugin.version>3.2.0</maven-checkstyle-plugin.version>
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
<swagger-plugin.version>2.1.6</swagger-plugin.version>
@@ -87,7 +87,7 @@
<font-awesome.version>6.2.0</font-awesome.version>
<spring.version>5.3.23</spring.version>
<tomcat.version>9.0.68</tomcat.version>
- <ical4j.version>4.0.0-beta2</ical4j.version>
+ <ical4j.version>4.0.0-beta3</ical4j.version>
<cxf.version>3.5.4</cxf.version>
<io.prometheus.version>0.16.0</io.prometheus.version>
<aspectjtools.version>1.9.9.1</aspectjtools.version>
@@ -114,14 +114,14 @@
<xstream.version>1.4.19</xstream.version>
<api-all.version>2.1.2</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
- <tika-parsers.version>2.5.0</tika-parsers.version>
+ <tika-parsers.version>2.6.0</tika-parsers.version>
<commons-text.version>1.10.0</commons-text.version>
<slf4j.version>2.0.3</slf4j.version>
<logback.version>1.4.4</logback.version>
<jetty.version>9.4.49.v20220914</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
- <mockito.version>4.8.0</mockito.version>
+ <mockito.version>4.8.1</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>6.18.0</kurento.version>
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions
are broken! -->
@@ -131,9 +131,10 @@
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>
- <swagger.version>2.2.4</swagger.version>
+ <swagger.version>2.2.6</swagger.version>
<bytebuddy.version>1.12.18</bytebuddy.version>
<annotation-api.version>1.3.2</annotation-api.version>
+ <jsr305.version>3.0.2</jsr305.version>
<!-- Exclude all generated code -->
<sonar.exclusions>file:**/generated-sources/**,
file:**/jquery-ui.css, file:**/cssemoticons.js,
file:**/bootstrap-confirmation.js</sonar.exclusions>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -875,8 +876,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
@@ -965,6 +966,12 @@
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
+ <dependency>
+ <!-- required for @NonNull, temporary -->
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr305.version}</version>
+ </dependency>
<!-- TESTS -->
<dependency>
