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 2017/05/11 03:11:57 UTC
openmeetings git commit: no jira: code clean-up
Repository: openmeetings
Updated Branches:
refs/heads/3.2.x 7dde5a9df -> 56ed9869a
no jira: code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/56ed9869
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/56ed9869
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/56ed9869
Branch: refs/heads/3.2.x
Commit: 56ed9869aac4f02d249973eab76aa9c89149e4af
Parents: 7dde5a9
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu May 11 10:11:49 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu May 11 10:11:49 2017 +0700
----------------------------------------------------------------------
.../db/dao/basic/ConfigurationDao.java | 21 --------------------
.../db/entity/basic/Configuration.java | 2 +-
.../openmeetings/backup/BackupExport.java | 2 +-
3 files changed, 2 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index d9451be..3e054a0 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -142,27 +142,6 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
}
}
- public List<Configuration> getConfigurations(int start, int max, String orderby, boolean asc) {
- try {
-
- String query = "SELECT c FROM Configuration c LEFT JOIN FETCH c.user WHERE c.deleted = false ORDER BY " + orderby;
-
- if (asc) {
- query += " ASC";
- } else {
- query += " DESC";
- }
-
- TypedQuery<Configuration> q = em.createQuery(query, Configuration.class);
- q.setFirstResult(start);
- q.setMaxResults(max);
- return q.getResultList();
- } catch (Exception ex2) {
- log.error("[getConfigurations]", ex2);
- }
- return null;
- }
-
/**
*/
public Configuration add(String key, String value, Long userId, String comment) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
index 5319d04..6abd61c 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
@@ -46,7 +46,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c "
+ "WHERE c.key IN :keys and c.deleted = false"),
@NamedQuery(name = "getNondeletedConfiguration", query = "SELECT c FROM Configuration c "
- + "LEFT JOIN FETCH c.user WHERE c.deleted = false"),
+ + "LEFT JOIN FETCH c.user WHERE c.deleted = false ORDER BY c.id ASC"),
@NamedQuery(name = "getConfigurationById", query = "SELECT c FROM Configuration c "
+ "LEFT JOIN FETCH c.user WHERE c.id = :id and c.deleted = false"),
@NamedQuery(name = "countConfigurations", query = "SELECT COUNT(c) FROM Configuration c WHERE c.deleted = false")
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/56ed9869/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 7522528..a18586b 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -360,7 +360,7 @@ public class BackupExport {
* ##################### Config
*/
{
- List<Configuration> list = configurationDao.getConfigurations(0, Integer.MAX_VALUE, "c.id", true);
+ List<Configuration> list = configurationDao.get(0, Integer.MAX_VALUE);
Registry registry = new Registry();
registry.bind(User.class, UserConverter.class);
Strategy strategy = new RegistryStrategy(registry);