You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/02/19 04:41:35 UTC
[openmeetings] branch master updated (a53ff2b -> 5a11720)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from a53ff2b [OPENMEETINGS-2675] maven-compiler-plugin
new 28abd48 [OPENMEETINGS-2675] maven-site-plugin, spring, postgresql
new 5a11720 [OPENMEETINGS-2722] CLI admin detects deleted recordings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openmeetings/db/dao/file/BaseFileItemDao.java | 28 +++++++++++++---------
.../openmeetings/db/dao/file/FileItemDao.java | 5 ----
.../openmeetings/db/dao/record/RecordingDao.java | 5 ----
.../openmeetings/db/entity/file/BaseFileItem.java | 1 +
.../apache/openmeetings/backup/BackupImport.java | 2 +-
.../org/apache/openmeetings/cli/CleanupHelper.java | 4 ++--
.../src/main/assembly/scripts/admin.bat | 4 +++-
.../src/main/assembly/scripts/admin.sh | 6 +++--
.../apache/openmeetings/backup/TestImportOld.java | 4 ++--
pom.xml | 6 ++---
10 files changed, 33 insertions(+), 32 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2722] CLI admin detects deleted recordings
Posted by so...@apache.org.
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
commit 5a117207bdb7bbec3b61a08ebe049f18a0234208
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Feb 19 11:41:19 2022 +0700
[OPENMEETINGS-2722] CLI admin detects deleted recordings
---
.../openmeetings/db/dao/file/BaseFileItemDao.java | 28 +++++++++++++---------
.../openmeetings/db/dao/file/FileItemDao.java | 5 ----
.../openmeetings/db/dao/record/RecordingDao.java | 5 ----
.../openmeetings/db/entity/file/BaseFileItem.java | 1 +
.../apache/openmeetings/backup/BackupImport.java | 2 +-
.../org/apache/openmeetings/cli/CleanupHelper.java | 4 ++--
.../src/main/assembly/scripts/admin.bat | 4 +++-
.../src/main/assembly/scripts/admin.sh | 6 +++--
.../apache/openmeetings/backup/TestImportOld.java | 4 ++--
9 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
index e3d9def..46d0148 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.db.dao.file;
import static org.apache.openmeetings.db.util.DaoHelper.UNSUPPORTED;
+import static org.apache.openmeetings.db.util.DaoHelper.single;
import java.util.List;
@@ -53,11 +54,12 @@ public class BaseFileItemDao implements IDataProviderDao<BaseFileItem> {
@Autowired
private UserDao userDao;
- public BaseFileItem get(String hash) {
- log.debug("getByHash() started");
- List<BaseFileItem> list = em.createNamedQuery("getFileByHash", BaseFileItem.class)
- .setParameter("hash", hash).getResultList();
- return list.size() == 1 ? list.get(0) : null;
+ public <T extends BaseFileItem> T get(String hash, Class<T> clazz) {
+ return getAny("getFileByHash", hash, clazz);
+ }
+
+ public <T extends BaseFileItem> T getAny(String hash, Class<T> clazz) {
+ return getAny("getAnyFileByHash", hash, clazz);
}
@Override
@@ -69,15 +71,19 @@ public class BaseFileItemDao implements IDataProviderDao<BaseFileItem> {
if (id == null || id.longValue() <= 0) {
return null;
}
- List<BaseFileItem> list = em.createNamedQuery("getFileById", BaseFileItem.class)
- .setParameter("id", id).getResultList();
- return list.size() == 1 ? list.get(0) : null;
+ return single(em.createNamedQuery("getFileById", BaseFileItem.class)
+ .setParameter("id", id).getResultList());
}
public BaseFileItem getAny(Long id) {
- List<BaseFileItem> list = em.createNamedQuery("getAnyFileById", BaseFileItem.class)
- .setParameter("id", id).getResultList();
- return list.size() == 1 ? list.get(0) : null;
+ return single(em.createNamedQuery("getAnyFileById", BaseFileItem.class)
+ .setParameter("id", id).getResultList());
+ }
+
+ private <T extends BaseFileItem> T getAny(String query, String hash, Class<T> clazz) {
+ log.debug("getAny[{}]() started", query);
+ return single(em.createNamedQuery(query, clazz)
+ .setParameter("hash", hash).getResultList());
}
public void delete(BaseFileItem f) {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
index afe0999..9de3ddb 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
@@ -95,11 +95,6 @@ public class FileItemDao extends BaseFileItemDao {
.getResultList();
}
- public FileItem getByHash(String hash) {
- BaseFileItem bf = super.get(hash);
- return bf instanceof FileItem ? (FileItem)bf : null;
- }
-
@Override
public FileItem get(Long id) {
BaseFileItem bf = super.get(id);
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
index 09c953e..3caedf9 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
@@ -61,11 +61,6 @@ public class RecordingDao extends BaseFileItemDao {
return bf instanceof Recording ? (Recording)bf : null;
}
- public Recording getByHash(String hash) {
- BaseFileItem bf = super.get(hash);
- return bf instanceof Recording ? (Recording)bf : null;
- }
-
public List<Recording> getByExternalUser(String externalId, String externalType) {
log.debug("getByExternalUser :externalId: {}; externalType: {}", externalId, externalType);
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 44eed4f..d5de5aa 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
@@ -64,6 +64,7 @@ import org.apache.openmeetings.util.OmFileHelper;
@NamedQuery(name = "getFileById", query = "SELECT f FROM BaseFileItem f WHERE f.deleted = false AND f.id = :id")
@NamedQuery(name = "getAnyFileById", query = "SELECT f FROM BaseFileItem f WHERE f.id = :id")
@NamedQuery(name = "getFileByHash", query = "SELECT f FROM BaseFileItem f WHERE f.deleted = false AND f.hash = :hash")
+@NamedQuery(name = "getAnyFileByHash", query = "SELECT f FROM BaseFileItem f WHERE f.hash = :hash")
@NamedQuery(name = "getAllFileItemsForRoom", query = "SELECT f FROM BaseFileItem f"
+ " WHERE f.deleted = false AND f.type <> :folder"
+ " AND (f.roomId IS NULL OR f.roomId = :roomId)"
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 ec17fa0..a98b1e0 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
@@ -993,7 +993,7 @@ public class BackupImport {
private void checkHash(BaseFileItem file, BaseFileItemDao dao, BiConsumer<String, String> consumer) {
String oldHash = file.getHash();
- if (Strings.isEmpty(oldHash) || !UUID_PATTERN.matcher(oldHash).matches() || dao.get(oldHash) != null) {
+ if (Strings.isEmpty(oldHash) || !UUID_PATTERN.matcher(oldHash).matches() || dao.get(oldHash, BaseFileItem.class) != null) {
file.setHash(randomUUID().toString());
hashMap.put(oldHash, file.getHash());
if (consumer != null) {
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
index 76fe052..e3fd7d7 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
@@ -80,7 +80,7 @@ public class CleanupHelper {
List<File> deleted = new ArrayList<>();
int missing = 0;
for (File f : list(parent, null)) {
- FileItem item = fileDao.getByHash(f.getName());
+ FileItem item = fileDao.get(f.getName(), FileItem.class);
if (item == null) {
invalid.add(f);
} else if (item.isDeleted()) {
@@ -106,7 +106,7 @@ public class CleanupHelper {
continue;
}
String hash = f.getName().substring(0, f.getName().length() - EXTENSION_MP4.length() - 1);
- Recording item = recordDao.getByHash(hash);
+ Recording item = recordDao.getAny(hash, Recording.class);
if (item == null) {
addAll(invalid, list(hash));
} else if (item.isDeleted()) {
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.bat b/openmeetings-server/src/main/assembly/scripts/admin.bat
index 0c69c30..c55ed5e 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.bat
+++ b/openmeetings-server/src/main/assembly/scripts/admin.bat
@@ -15,7 +15,9 @@ REM #############################################
set OM_HOME=%~dp0
set OM_CONTEXT=openmeetings
+set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED"
+
set CLASSPATH=%OM_HOME%\*;%OM_HOME%\lib\*;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF\lib\*;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF;%OM_HOME%\webapps\%OM_CONTEXT%\WEB-INF\classes
-java -cp "%CLASSPATH%" -Dom_home=%OM_HOME% -Dcontext=%OM_CONTEXT% org.apache.openmeetings.cli.Admin %*
+java %JAVA_OPTS% -cp "%CLASSPATH%" -Dom_home=%OM_HOME% -Dcontext=%OM_CONTEXT% org.apache.openmeetings.cli.Admin %*
diff --git a/openmeetings-server/src/main/assembly/scripts/admin.sh b/openmeetings-server/src/main/assembly/scripts/admin.sh
index 3d9c59f..b0dede8 100644
--- a/openmeetings-server/src/main/assembly/scripts/admin.sh
+++ b/openmeetings-server/src/main/assembly/scripts/admin.sh
@@ -15,7 +15,9 @@
export OM_HOME=$(cd $(dirname "$0"); pwd)
export OM_CONTEXT=openmeetings
-export CLASSPATH=$OM_HOME/*:$OM_HOME/lib/*:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF/lib/*:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF:$OM_HOME/webapps/${OM_CONTEXT}/WEB-INF/classes
+export JDK_JAVA_OPTIONS="--add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED"
-java -cp "$CLASSPATH" -Dom_home=${OM_HOME} -Dcontext=${OM_CONTEXT} org.apache.openmeetings.cli.Admin $*
+export CLASSPATH=${OM_HOME}/*:${OM_HOME}/lib/*:${OM_HOME}/webapps/${OM_CONTEXT}/WEB-INF/lib/*:${OM_HOME}/webapps/${OM_CONTEXT}/WEB-INF:${OM_HOME}/webapps/${OM_CONTEXT}/WEB-INF/classes
+
+java ${JAVA_OPTS} -cp "${CLASSPATH}" -Dom_home=${OM_HOME} -Dcontext=${OM_CONTEXT} org.apache.openmeetings.cli.Admin $*
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
index ce6aa5a..b5d9452 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
@@ -110,10 +110,10 @@ class TestImportOld extends AbstractTestImport {
roomDao.getMyRooms(usr2.getId(), "bla", "bla1").forEach(r -> {
assertTrue(r.getComment().contains("user2_jira_2423"));
});
- FileItem f1 = fileDao.getByHash("820b356c-2c96-4634-90c4-3e490432987f");
+ FileItem f1 = fileDao.get("820b356c-2c96-4634-90c4-3e490432987f", FileItem.class);
assertEquals(usr2.getId(), f1.getInsertedBy(), "Inserted by is wrong");
assertEquals(usr2.getId(), f1.getOwnerId(), "Owner is wrong");
- FileItem f2 = fileDao.getByHash("7af3f90d-2a8d-44fa-9e0f-79fd87511cc6");
+ FileItem f2 = fileDao.get("7af3f90d-2a8d-44fa-9e0f-79fd87511cc6", FileItem.class);
assertEquals(grp2.getId(), f2.getGroupId(), "Group is wrong");
}
}
[openmeetings] 01/02: [OPENMEETINGS-2675] maven-site-plugin, spring, postgresql
Posted by so...@apache.org.
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
commit 28abd48cfabd73392f39dc2efe1751772ef49dd9
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Feb 19 11:38:40 2022 +0700
[OPENMEETINGS-2675] maven-site-plugin, spring, postgresql
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index ad242a8..754d1a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
- <maven-site-plugin.version>3.10.0</maven-site-plugin.version>
+ <maven-site-plugin.version>3.11.0</maven-site-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<minify-maven-plugin.version>1.7.6</minify-maven-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
@@ -85,7 +85,7 @@
<wicketstuff.version>9.8.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version>
<font-awesome.version>6.0.0</font-awesome.version>
- <spring.version>5.3.15</spring.version>
+ <spring.version>5.3.16</spring.version>
<tomcat.version>9.0.58</tomcat.version>
<ical4j.version>4.0.0-alpha11</ical4j.version>
<cxf.version>3.5.0</cxf.version>
@@ -106,7 +106,7 @@
<dom4j.version>2.1.3</dom4j.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-io.version>2.11.0</commons-io.version>
- <postgresql.version>42.3.2</postgresql.version>
+ <postgresql.version>42.3.3</postgresql.version>
<mysql.version>8.0.28</mysql.version>
<mssql.version>10.2.0.jre11</mssql.version>
<ojdbc.version>19.13.0.0.1</ojdbc.version>