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 2018/02/26 04:05:18 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1791] tests are
fixed
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 6838791 [OPENMEETINGS-1791] tests are fixed
6838791 is described below
commit 68387913bc71322ad34f24471c5142994a501476
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Feb 26 11:04:31 2018 +0700
[OPENMEETINGS-1791] tests are fixed
---
.../org/apache/openmeetings/web/app/ClientManager.java | 15 +++------------
.../org/apache/openmeetings/web/app/QuickPollManager.java | 11 +----------
.../apache/openmeetings/web/app/StreamClientManager.java | 14 ++------------
.../apache/openmeetings/web/app/WhiteboardManager.java | 11 +----------
4 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index d3b8e85..c1ca3d0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -31,8 +31,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Predicate;
-import javax.annotation.PostConstruct;
-
import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
import org.apache.openmeetings.db.entity.basic.Client;
@@ -47,7 +45,6 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
@Component
@@ -56,28 +53,22 @@ public class ClientManager implements IClientManager {
private static final String ROOMS_KEY = "ROOMS_KEY";
private static final String ONLINE_USERS_KEY = "ONLINE_USERS_KEY";
private static final String UID_BY_SID_KEY = "UID_BY_SID_KEY";
- private HazelcastInstance hazelcast;
@Autowired
private ConferenceLogDao confLogDao;
@Autowired
private ScopeApplicationAdapter scopeAdapter;
- @PostConstruct
- private void init() {
- this.hazelcast = getHazelcast();
- }
-
private Map<String, Client> map() {
- return hazelcast.getMap(ONLINE_USERS_KEY);
+ return getHazelcast().getMap(ONLINE_USERS_KEY);
}
private Map<String, String> mapUidBySid() {
- return hazelcast.getMap(UID_BY_SID_KEY);
+ return getHazelcast().getMap(UID_BY_SID_KEY);
}
private IMap<Long, Set<String>> getRooms() {
- return hazelcast.getMap(ROOMS_KEY);
+ return getHazelcast().getMap(ROOMS_KEY);
}
public void add(Client c) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
index b143603..e377c8b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
@@ -26,8 +26,6 @@ import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.room.Room;
@@ -37,22 +35,15 @@ import org.slf4j.Logger;
import org.springframework.stereotype.Component;
import com.github.openjson.JSONObject;
-import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
@Component
public class QuickPollManager {
private static final Logger log = getLogger(QuickPollManager.class, getWebAppRootKey());
private static final String QPOLLS_KEY = "QPOLLS_KEY";
- private HazelcastInstance hazelcast;
-
- @PostConstruct
- private void init() {
- this.hazelcast = getHazelcast();
- }
private IMap<Long, Map<Long, Boolean>> map() {
- return hazelcast.getMap(QPOLLS_KEY);
+ return getHazelcast().getMap(QPOLLS_KEY);
}
public boolean isStarted(Long roomId) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
index 74ad459..bee0af1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
@@ -34,8 +34,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.remote.MobileService;
import org.apache.openmeetings.core.util.WebSocketHelper;
@@ -59,8 +57,6 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.hazelcast.core.HazelcastInstance;
-
/**
* Handle {@link StreamClient} objects.
*
@@ -73,7 +69,6 @@ import com.hazelcast.core.HazelcastInstance;
public class StreamClientManager implements IStreamClientManager {
protected static final Logger log = Red5LoggerFactory.getLogger(StreamClientManager.class, getWebAppRootKey());
private static final String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY";
- private HazelcastInstance hazelcast;
@Autowired
private ClientManager clientManager;
@@ -86,13 +81,8 @@ public class StreamClientManager implements IStreamClientManager {
@Autowired
private RoomDao roomDao;
- @PostConstruct
- private void init() {
- this.hazelcast = getHazelcast();
- }
-
public Map<String, StreamClient> map() {
- return hazelcast.getMap(STREAM_CLIENT_KEY);
+ return getHazelcast().getMap(STREAM_CLIENT_KEY);
}
@Override
@@ -123,7 +113,7 @@ public class StreamClientManager implements IStreamClientManager {
@Override
public IClient update(IClient c) {
if (c instanceof StreamClient) {
- hazelcast.getMap(STREAM_CLIENT_KEY).put(c.getUid(), c);
+ map().put(c.getUid(), (StreamClient)c);
} else {
clientManager.update((Client)c);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index de0b351..9a8c4f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -24,15 +24,12 @@ import static org.apache.openmeetings.web.app.Application.getHazelcast;
import java.util.Map.Entry;
import java.util.Set;
-import javax.annotation.PostConstruct;
-
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.manager.IWhiteboardManager;
import org.springframework.stereotype.Component;
-import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.IMap;
/**
@@ -44,15 +41,9 @@ import com.hazelcast.core.IMap;
@Component
public class WhiteboardManager implements IWhiteboardManager {
private static final String WBS_KEY = "WBS_KEY";
- private HazelcastInstance hazelcast;
-
- @PostConstruct
- private void init() {
- this.hazelcast = getHazelcast();
- }
private IMap<Long, Whiteboards> getCache() {
- return hazelcast.getMap(WBS_KEY);
+ return getHazelcast().getMap(WBS_KEY);
}
public boolean tryLock(Long roomId) {
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.