You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2013/02/02 04:58:39 UTC
svn commit: r1441696 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store:
DatabaseStore.java HashMapStore.java IClientPersistenceStore.java
Author: sebawagner
Date: Sat Feb 2 03:58:38 2013
New Revision: 1441696
URL: http://svn.apache.org/viewvc?rev=1441696&view=rev
Log:
OPENMEETINGS-460 Complete and update Test with new methods and fix existing ones in ClientDao
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java?rev=1441696&r1=1441695&r2=1441696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java Sat Feb 2 03:58:38 2013
@@ -85,12 +85,13 @@ public class DatabaseStore implements IC
}
return returnMap;
}
+
+ public Collection<Client> getClients() {
+ return clientDao.getClients();
+ }
- public LinkedHashMap<String, Client> getClientsByServer(Server server) {
- List<Client> clientList = clientDao.getClientsByServer(server);
-
- // TODO Auto-generated method stub
- return null;
+ public Collection<Client> getClientsByServer(Server server) {
+ return clientDao.getClientsByServer(server);
}
public List<Client> getClientsByUserId(Server server, Long userId) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java?rev=1441696&r1=1441695&r2=1441696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java Sat Feb 2 03:58:38 2013
@@ -92,8 +92,12 @@ public class HashMapStore implements ICl
return clientMapList;
}
- public LinkedHashMap<String, Client> getClientsByServer(Server server) {
- return clientsByStreamId;
+ public Collection<Client> getClients() {
+ return clientsByStreamId.values();
+ }
+
+ public Collection<Client> getClientsByServer(Server server) {
+ return clientsByStreamId.values();
}
public List<Client> getClientsByUserId(Server server, Long userId) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java?rev=1441696&r1=1441695&r2=1441696&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/IClientPersistenceStore.java Sat Feb 2 03:58:38 2013
@@ -79,14 +79,15 @@ public interface IClientPersistenceStore
public abstract Map<Long, List<Client>> getClientsByPublicSID(
String publicSID);
+ public abstract Collection<Client> getClients();
+
/**
* get all clients by a specific {@link Server}
*
* @param server
* @return will return an empty map if nothing available
*/
- public abstract LinkedHashMap<String, Client> getClientsByServer(
- Server server);
+ public abstract Collection<Client> getClientsByServer(Server server);
/**
*
@@ -94,7 +95,7 @@ public interface IClientPersistenceStore
* @param userId
* @return will return an empty list if nothing available
*/
- public abstract List<Client> getClientsByUserId(Server server, Long userId);
+ public abstract Collection<Client> getClientsByUserId(Server server, Long userId);
/**
*