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 2016/04/04 12:49:27 UTC
svn commit: r1737653 [5/7] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/
branche...
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Mon Apr 4 10:49:25 2016
@@ -229,6 +229,7 @@ public class MailHandler {
mailMessageDao.update(m, null);
}
taskExecutor.execute(new Runnable() {
+ @Override
public void run() {
log.debug("Message sending in progress");
log.debug(" To: " + m.getRecipients());
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java Mon Apr 4 10:49:25 2016
@@ -87,6 +87,7 @@ public class SMSHandler {
this.languageId = languageId;
}
+ @Override
public void run() {
this.send();
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java Mon Apr 4 10:49:25 2016
@@ -270,6 +270,7 @@ public class ConferenceLibrary implement
return -1L;
}
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
// TODO Auto-generated method stub
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java Mon Apr 4 10:49:25 2016
@@ -56,11 +56,12 @@ public class InvitationService implement
@Autowired
private RoomDao roomDao;
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
log.debug("InvitationService resultReceived" + arg0);
}
- private Date getDate(String date, String time, String tzId) {
+ private static Date getDate(String date, String time, String tzId) {
LocalDateTime d = LocalDateTime.of(
Integer.parseInt(date.substring(6)) //year
, Integer.parseInt(date.substring(3, 5)) //month
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Mon Apr 4 10:49:25 2016
@@ -428,6 +428,7 @@ public class MainService implements IPen
return null;
}
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
log.debug("[resultReceived]" + arg0);
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java Mon Apr 4 10:49:25 2016
@@ -79,7 +79,7 @@ public class MobileService {
@Autowired
private ScopeApplicationAdapter scopeAdapter;
- private void add(Map<String, Object> m, String key, Object v) {
+ private static void add(Map<String, Object> m, String key, Object v) {
m.put(key, v == null ? "" : v);
}
@@ -182,7 +182,7 @@ public class MobileService {
return result;
}
- private Map<String, Object> getResult() {
+ private static Map<String, Object> getResult() {
Map<String, Object> result = new Hashtable<>();
result.put("status", -1);
return result;
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Mon Apr 4 10:49:25 2016
@@ -81,6 +81,7 @@ public class RecordingService implements
@Autowired
private RecordingMetaDataDao metaDataDao;
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java Mon Apr 4 10:49:25 2016
@@ -106,6 +106,7 @@ public class UserService implements IUse
* REST call
* @return - true if user has sufficient permissions, false otherwise
*/
+ @Override
public boolean kickUserByStreamId(String SID, String streamid, long serverId) {
try {
Long userId = sessiondataDao.checkSession(SID);
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Mon Apr 4 10:49:25 2016
@@ -334,7 +334,7 @@ public class WhiteBoardService implement
return;
}
- private int getNumberOfInitialLoaders(Map<String, WhiteboardSyncLockObject> syncListRoom) throws Exception {
+ private static int getNumberOfInitialLoaders(Map<String, WhiteboardSyncLockObject> syncListRoom) throws Exception {
int number = 0;
for (Map.Entry<String, WhiteboardSyncLockObject> e : syncListRoom.entrySet()) {
if (e.getValue().isInitialLoaded()) {
@@ -472,6 +472,7 @@ public class WhiteBoardService implement
File clipart_dir = OmFileHelper.getPublicClipartsDir();
FilenameFilter getFilesOnly = new FilenameFilter() {
+ @Override
public boolean accept(File b, String name) {
File f = new File(b, name);
return !f.isDirectory();
@@ -479,6 +480,7 @@ public class WhiteBoardService implement
};
FilenameFilter getDirectoriesOnly = new FilenameFilter() {
+ @Override
public boolean accept(File b, String name) {
File f = new File(b, name);
return f.isDirectory() && !f.getName().equals("thumb");
@@ -517,6 +519,7 @@ public class WhiteBoardService implement
return null;
}
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
log.debug("resultReceived: " + arg0);
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Mon Apr 4 10:49:25 2016
@@ -108,6 +108,7 @@ public class ScopeApplicationAdapter ext
private static AtomicLong broadCastCounter = new AtomicLong(0);
+ @Override
public void resultReceived(IPendingServiceCall arg0) {
// TODO Auto-generated method stub
}
@@ -916,7 +917,7 @@ public class ScopeApplicationAdapter ext
return 0L;
}
- public Boolean getMicMutedByPublicSID(String publicSID) {
+ public boolean getMicMutedByPublicSID(String publicSID) {
try {
Client currentClient = sessionManager.getClientByPublicSID(publicSID, null);
if (currentClient == null) {
@@ -924,12 +925,7 @@ public class ScopeApplicationAdapter ext
}
//Put the mod-flag to true for this client
- Boolean muted = currentClient.getMicMuted();
- if (null == muted) {
- muted = true;
- }
-
- return muted;
+ return currentClient.getMicMuted();
} catch (Exception err) {
log.error("[getMicMutedByPublicSID]",err);
}
@@ -1153,7 +1149,7 @@ public class ScopeApplicationAdapter ext
// Return Object
RoomStatus roomStatus = new RoomStatus();
// appointed meeting or moderated Room? => Check Max Users first
- if (room.getNumberOfPartizipants() != null && clientListRoom.size() > room.getNumberOfPartizipants()) {
+ if (clientListRoom.size() > room.getNumberOfPartizipants()) {
roomStatus.setRoomFull(true);
return roomStatus;
}
@@ -1674,6 +1670,7 @@ public class ScopeApplicationAdapter ext
*/
public void sendMessageToCurrentScope(final String remoteMethodName, final Object newMessage, final boolean sendSelf, final boolean sendScreen) {
new MessageSender(remoteMethodName, newMessage) {
+ @Override
public boolean filter(IConnection conn) {
IClient client = conn.getClient();
return (!sendScreen && SessionVariablesUtil.isScreenClient(client))
@@ -1905,7 +1902,7 @@ public class ScopeApplicationAdapter ext
if (conn != null) {
Client rcl = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (rcl.getIsRecording() != null && rcl.getIsRecording()) {
+ if (rcl.getIsRecording()) {
return true;
}
}
@@ -1929,7 +1926,7 @@ public class ScopeApplicationAdapter ext
if (conn != null) {
Client rcl = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (rcl != null && rcl.getIsRecording() != null && rcl.getIsRecording()) {
+ if (rcl != null && rcl.getIsRecording()) {
return false;
}
}
@@ -1984,7 +1981,7 @@ public class ScopeApplicationAdapter ext
Long recordingId = null;
if (conn != null) {
Client rcl = sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (rcl != null && rcl.getIsRecording() != null && rcl.getIsRecording()) {
+ if (rcl != null && rcl.getIsRecording()) {
rcl.setIsRecording(false);
recordingId = rcl.getRecordingId();
rcl.setRecordingId(null);
@@ -2120,7 +2117,7 @@ public class ScopeApplicationAdapter ext
return getSipTransportLastname(roomId, roomManager.getSipConferenceMembersNumber(roomId));
}
- private String getSipTransportLastname(Long roomId, Integer c) {
+ private static String getSipTransportLastname(Long roomId, Integer c) {
return (c != null && c > 0) ? "(" + (c - 1) + ")" : "";
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java Mon Apr 4 10:49:25 2016
@@ -35,13 +35,10 @@ public abstract class BaseHttpServlet ex
}
protected void handleNotBooted(HttpServletResponse response) throws IOException {
- OutputStream out = response.getOutputStream();
-
- String msg = "Server is not booted yet";
-
- out.write(msg.getBytes(StandardCharsets.UTF_8));
-
- out.flush();
- out.close();
+ try (OutputStream out = response.getOutputStream()) {
+ String msg = "Server is not booted yet";
+ out.write(msg.getBytes(StandardCharsets.UTF_8));
+ out.flush();
+ }
}
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java Mon Apr 4 10:49:25 2016
@@ -157,16 +157,16 @@ public class ExportToImage extends BaseH
outFile(response, expFile);
} else if ("jpg".equals(exportType)) {
JPEGTranscoder t = new JPEGTranscoder();
- t.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, 1f);
-
- OutputStream ostream = new FileOutputStream(expFile);
- TranscoderOutput output = new TranscoderOutput(new FileOutputStream(expFile));
-
- // Perform the transcoding.
- t.transcode(new TranscoderInput(svgFile.toURI().toString()), output);
- ostream.flush();
- ostream.close();
-
+ t.addTranscodingHint(JPEGTranscoder.KEY_QUALITY, 1f);
+
+ try (OutputStream ostream = new FileOutputStream(expFile)) {
+ TranscoderOutput output = new TranscoderOutput(new FileOutputStream(expFile));
+
+ // Perform the transcoding.
+ t.transcode(new TranscoderInput(svgFile.toURI().toString()), output);
+ ostream.flush();
+ }
+
outFile(response, expFile);
} else if (exportType.equals("png")
|| exportType.equals("gif") || exportType.equals("tif")
@@ -181,16 +181,15 @@ public class ExportToImage extends BaseH
}
}
- private void outFile(HttpServletResponse response, File f) throws IOException {
+ private static void outFile(HttpServletResponse response, File f) throws IOException {
response.reset();
response.resetBuffer();
- OutputStream outStream = response.getOutputStream();
- response.setContentType("APPLICATION/OCTET-STREAM");
- response.setHeader("Content-Disposition", "attachment; filename=\"" + f.getName() + "\"");
- response.setHeader("Content-Length", "" + f.length());
-
- OmFileHelper.copyFile(f, outStream);
- outStream.close();
- }
+ try (OutputStream outStream = response.getOutputStream()) {
+ response.setContentType("APPLICATION/OCTET-STREAM");
+ response.setHeader("Content-Disposition", "attachment; filename=\"" + f.getName() + "\"");
+ response.setHeader("Content-Length", "" + f.length());
+ OmFileHelper.copyFile(f, outStream);
+ }
+ }
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java Mon Apr 4 10:49:25 2016
@@ -64,7 +64,7 @@ public class NetworkTestingController {
public void serviceGet(HttpServletRequest request, HttpServletResponse response, HttpSession session)
throws ServletException, IOException {
String typeStr = request.getParameter("testType");
- TestType testType = this.getTypeByString(typeStr);
+ TestType testType = getTypeByString(typeStr);
// choose data to send
byte[] data = new byte[0];
@@ -102,7 +102,7 @@ public class NetworkTestingController {
}
- private TestType getTypeByString(String typeString) {
+ private static TestType getTypeByString(String typeString) {
if ("ping".equals(typeString)) {
return TestType.PING;
} else if ("jitter".equals(typeString)) {
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java Mon Apr 4 10:49:25 2016
@@ -75,8 +75,9 @@ public class SessionManager implements I
cache.clear();
}
+ @Override
public Client addClientListItem(String streamId, String scopeName,
- Integer remotePort, String remoteAddress, String swfUrl, Server server) {
+ int remotePort, String remoteAddress, String swfUrl, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
}
@@ -97,7 +98,7 @@ public class SessionManager implements I
rcm.setUserip(remoteAddress);
rcm.setSwfurl(swfUrl);
rcm.setIsMod(false);
- rcm.setCanDraw(new Boolean(false));
+ rcm.setCanDraw(false);
if (cache.containsKey(null, streamId)) {
log.error("Tried to add an existing Client " + streamId);
@@ -113,14 +114,17 @@ public class SessionManager implements I
return null;
}
+ @Override
public Collection<Client> getClients() {
return cache.getClients();
}
+ @Override
public Collection<Client> getClientsWithServer() {
return cache.getClientsWithServer();
}
+ @Override
public Client getClientByStreamId(String streamId, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -137,6 +141,7 @@ public class SessionManager implements I
return null;
}
+ @Override
public Client getClientByPublicSID(String publicSID, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -150,6 +155,7 @@ public class SessionManager implements I
return null;
}
+ @Override
public ClientSessionInfo getClientByPublicSIDAnyServer(String publicSID) {
try {
for (Entry<Long,List<Client>> entry : cache.getClientsByPublicSID(publicSID).entrySet()) {
@@ -163,6 +169,7 @@ public class SessionManager implements I
return null;
}
+ @Override
public Client getClientByUserId(Long userId) {
try {
for (Client rcl : cache.getClientsByUserId(null, userId)) {
@@ -178,6 +185,7 @@ public class SessionManager implements I
return null;
}
+ @Override
public boolean updateAVClientByStreamId(String streamId, Client rcm, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -208,6 +216,7 @@ public class SessionManager implements I
return false;
}
+ @Override
public boolean updateClientByStreamId(String streamId, Client rcm, boolean updateRoomCount, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -227,6 +236,7 @@ public class SessionManager implements I
return false;
}
+ @Override
public boolean removeClient(String streamId, Server server) {
if (server == null) {
server = serverUtil.getCurrentServer();
@@ -244,6 +254,7 @@ public class SessionManager implements I
return false;
}
+ @Override
public List<Client> getClientListByRoom(Long roomId) {
List<Client> roomClientList = new ArrayList<>();
try {
@@ -263,6 +274,7 @@ public class SessionManager implements I
return roomClientList;
}
+ @Override
public Collection<Client> getClientListByRoomAll(Long roomId) {
try {
return cache.getClientsByRoomId(roomId);
@@ -272,6 +284,7 @@ public class SessionManager implements I
return null;
}
+ @Override
public List<Client> getCurrentModeratorByRoom(Long roomId) {
List<Client> rclList = new LinkedList<>();
List<Client> currentClients = this.getClientListByRoom(roomId);
@@ -283,6 +296,7 @@ public class SessionManager implements I
return rclList;
}
+ @Override
public SearchResult<Client> getListByStartAndMax(int start, int max, String orderby, boolean asc) {
SearchResult<Client> sResult = new SearchResult<>();
sResult.setObjectName(Client.class.getName());
@@ -291,6 +305,7 @@ public class SessionManager implements I
return sResult;
}
+ @Override
public long getRecordingCount(long roomId) {
List<Client> currentClients = this.getClientListByRoom(roomId);
int numberOfRecordingUsers = 0;
@@ -302,6 +317,7 @@ public class SessionManager implements I
return numberOfRecordingUsers;
}
+ @Override
public long getPublishingCount(long roomId) {
List<Client> currentClients = this.getClientListByRoom(roomId);
int numberOfPublishingUsers = 0;
@@ -313,14 +329,17 @@ public class SessionManager implements I
return numberOfPublishingUsers;
}
+ @Override
public List<Long> getActiveRoomIdsByServer(Server server) {
return cache.getRoomsIdsByServer(server == null ? serverUtil.getCurrentServer() : server);
}
+ @Override
public String getSessionStatistics() {
return cache.getDebugInformation(Arrays.asList(IClientPersistenceStore.DEBUG_DETAILS.SIZE));
}
+ @Override
public void sessionStart() {
// TODO Auto-generated method stub
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java Mon Apr 4 10:49:25 2016
@@ -34,10 +34,12 @@ public class DatabaseStore implements IC
@Autowired
private ClientDao clientDao;
+ @Override
public void clear() {
clientDao.cleanAllClients();
}
+ @Override
public void put(String streamId, Client rcl) {
if (rcl.getId() != null) {
clientDao.update(rcl);
@@ -46,18 +48,22 @@ public class DatabaseStore implements IC
}
}
+ @Override
public boolean containsKey(Server server, String streamId) {
return clientDao.countClientsByServerAndStreamId(server, streamId) > 0;
}
+ @Override
public Client get(Server server, String streamId) {
return clientDao.getClientByServerAndStreamId(server, streamId);
}
+ @Override
public List<Client> getClientsByPublicSID(Server server, String publicSID) {
return clientDao.getClientsByPublicSIDAndServer(server, publicSID);
}
+ @Override
public Map<Long, List<Client>> getClientsByPublicSID(String publicSID) {
Map<Long, List<Client>> returnMap = new HashMap<Long, List<Client>>();
List<Client> clientList = clientDao.getClientsByPublicSID(publicSID);
@@ -81,47 +87,58 @@ public class DatabaseStore implements IC
return returnMap;
}
+ @Override
public Collection<Client> getClients() {
return clientDao.getClients();
}
+ @Override
public Collection<Client> getClientsWithServer() {
return clientDao.getClientsWithServer();
}
+ @Override
public Collection<Client> getClientsByServer(Server server) {
return clientDao.getClientsByServer(server);
}
+ @Override
public List<Client> getClientsByUserId(Server server, Long userId) {
return clientDao.getClientsByUserId(server, userId);
}
+ @Override
public List<Client> getClientsByRoomId(Long roomId) {
return clientDao.getClientsByRoomId(roomId);
}
+ @Override
public void remove(Server server, String streamId) {
clientDao.removeClientByServerAndStreamId(server, streamId);
}
+ @Override
public int size() {
return clientDao.countClients();
}
+ @Override
public int sizeByServer(Server server) {
return clientDao.countClientsByServer(server);
}
+ @Override
public Collection<Client> values() {
return clientDao.getClients();
}
+ @Override
public String getDebugInformation(List<DEBUG_DETAILS> detailLevel) {
// TODO Auto-generated method stub
return null;
}
+ @Override
public List<Long> getRoomsIdsByServer(Server server) {
return clientDao.getRoomsIdsByServer(server);
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java Mon Apr 4 10:49:25 2016
@@ -54,22 +54,27 @@ public class HashMapStore implements ICl
private Map<String, Client> clientsByStreamId = new ConcurrentHashMap<>();
+ @Override
public void clear() {
clientsByStreamId = new ConcurrentHashMap<>();
}
+ @Override
public void put(String streamId, Client rcl) {
clientsByStreamId.put(rcl.getStreamid(), rcl);
}
+ @Override
public boolean containsKey(Server server, String streamId) {
return clientsByStreamId.containsKey(streamId);
}
+ @Override
public Client get(Server server, String streamId) {
return clientsByStreamId.get(streamId);
}
+ @Override
public List<Client> getClientsByPublicSID(Server server, String publicSID) {
List<Client> clientList = new ArrayList<>();
for (Map.Entry<String, Client> e: clientsByStreamId.entrySet()) {
@@ -81,6 +86,7 @@ public class HashMapStore implements ICl
return clientList;
}
+ @Override
public Map<Long,List<Client>> getClientsByPublicSID(String publicSID) {
Map<Long,List<Client>> clientMapList = new HashMap<>();
List<Client> clientList = new ArrayList<>();
@@ -94,20 +100,24 @@ public class HashMapStore implements ICl
return clientMapList;
}
+ @Override
public Collection<Client> getClients() {
return clientsByStreamId.values();
}
+ @Override
public Collection<Client> getClientsWithServer() {
//there is no server object to be loaded, memory cache means
//there is no cluster enabled
return getClients();
}
+ @Override
public Collection<Client> getClientsByServer(Server server) {
return clientsByStreamId.values();
}
+ @Override
public List<Client> getClientsByUserId(Server server, Long userId) {
List<Client> clientList = new ArrayList<>();
for (Map.Entry<String, Client> e: clientsByStreamId.entrySet()) {
@@ -119,6 +129,7 @@ public class HashMapStore implements ICl
return clientList;
}
+ @Override
public List<Client> getClientsByRoomId(Long roomId) {
List<Client> clientList = new ArrayList<>();
for (Map.Entry<String, Client> e: clientsByStreamId.entrySet()) {
@@ -130,18 +141,22 @@ public class HashMapStore implements ICl
return clientList;
}
+ @Override
public void remove(Server server, String streamId) {
clientsByStreamId.remove(streamId);
}
+ @Override
public int size() {
return clientsByStreamId.size();
}
+ @Override
public int sizeByServer(Server server) {
return clientsByStreamId.size();
}
+ @Override
public Collection<Client> values() {
return clientsByStreamId.values();
}
@@ -161,6 +176,7 @@ public class HashMapStore implements ICl
log.debug("Session Statistics End ################## ");
}
+ @Override
public String getDebugInformation(List<DEBUG_DETAILS> detailLevel) {
StringBuilder statistics = new StringBuilder();
@@ -171,16 +187,17 @@ public class HashMapStore implements ICl
return statistics.toString();
}
- private void addNewLine(StringBuilder strBuilder, String message) {
+ private static void addNewLine(StringBuilder strBuilder, String message) {
strBuilder.append(message + "\n\r");
}
+ @Override
public List<Long> getRoomsIdsByServer(Server server) {
Set<Long> rooms = new HashSet<>();
for (Map.Entry<String, Client> e: clientsByStreamId.entrySet()) {
Client cl = e.getValue();
Long roomId = cl.getRoomId();
- if (roomId != null && roomId > 0 && !rooms.contains(roomId)) {
+ if (roomId != null && roomId.longValue() > 0 && !rooms.contains(roomId)) {
rooms.add(roomId);
}
}
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java Mon Apr 4 10:49:25 2016
@@ -81,6 +81,7 @@ public class EditorPaneLinkDetector exte
setDocument(doc);
addMouseMotionListener(new MouseMotionAdapter() {
+ @Override
public void mouseMoved(MouseEvent e) {
AccessibleJTextComponent context = (AccessibleJTextComponent) getAccessibleContext()
@@ -108,6 +109,7 @@ public class EditorPaneLinkDetector exte
});
addKeyListener(new KeyAdapter() {
+ @Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
@@ -122,6 +124,7 @@ public class EditorPaneLinkDetector exte
}
+ @Override
public void keyReleased(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
@@ -296,6 +299,7 @@ public class EditorPaneLinkDetector exte
}
}
+ @Override
public void remove(int offs, int len) throws BadLocationException {
super.remove(offs, len);
@@ -303,6 +307,7 @@ public class EditorPaneLinkDetector exte
computeLinks(e);
}
+ @Override
public void insertString(int offs, String str, AttributeSet a)
throws BadLocationException {
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java Mon Apr 4 10:49:25 2016
@@ -44,7 +44,7 @@ public class TestChatLinking {
}
- private String link(String input) {
+ private static String link(String input) {
try {
String tReturn = "";
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java Mon Apr 4 10:49:25 2016
@@ -22,6 +22,7 @@ import java.awt.*;
import java.awt.event.*;
class WindowClosingAdapter extends WindowAdapter {
+ @Override
public void windowClosing(WindowEvent event) {
event.getWindow().setVisible(false);
event.getWindow().dispose();
@@ -48,6 +49,7 @@ public class KeyCodesTest extends Frame
setVisible(true);
}
+ @Override
public void paint(Graphics g) {
if (msg1.length() > 0) {
draw3DRect(g, 20, 50, 250, 30);
@@ -70,11 +72,12 @@ public class KeyCodesTest extends Frame
g.drawLine(x + width, y + height, x + width, y);
}
+ @Override
public void keyPressed(KeyEvent event) {
msg1 = "";
System.out.println("keyPressed CODE1 "+event.getKeyCode());
- Integer myCode = event.getKeyCode();
+ int myCode = event.getKeyCode();
System.out.println("keyPressed CODE2 "+myCode);
@@ -120,11 +123,13 @@ public class KeyCodesTest extends Frame
repaint();
}
+ @Override
public void keyReleased(KeyEvent event) {
msg1 = "";
repaint();
}
+ @Override
public void keyTyped(KeyEvent event) {
char key = event.getKeyChar();
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java Mon Apr 4 10:49:25 2016
@@ -40,6 +40,7 @@ public class ReadKeyCodesTest extends Fr
setVisible(true);
}
+ @Override
public void paint(Graphics g) {
if (msg1.length() > 0) {
draw3DRect(g, 20, 50, 250, 30);
@@ -62,6 +63,7 @@ public class ReadKeyCodesTest extends Fr
g.drawLine(x + width, y + height, x + width, y);
}
+ @Override
public void keyPressed(KeyEvent event) {
msg1 = "";
System.out.println("keyPressed "+event.getKeyCode());
@@ -91,11 +93,13 @@ public class ReadKeyCodesTest extends Fr
repaint();
}
+ @Override
public void keyReleased(KeyEvent event) {
msg1 = "";
repaint();
}
+ @Override
public void keyTyped(KeyEvent event) {
char key = event.getKeyChar();
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/LoadTestRtmpClient.java Mon Apr 4 10:49:25 2016
@@ -118,6 +118,7 @@ public class LoadTestRtmpClient extends
return averageTime;
}
+ @Override
public void resultReceived(IPendingServiceCall call) {
String method = call == null ? null : call.getServiceMethodName();
System.err.println("method "+method);
@@ -158,6 +159,7 @@ public class LoadTestRtmpClient extends
}
+ @Override
public void onStreamEvent(Notify notify) {
// TODO Auto-generated method stub
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java Mon Apr 4 10:49:25 2016
@@ -66,6 +66,7 @@ public class SimulateLoad extends Thread
loadTestRtmpClient);
}
+ @Override
public void run() {
try {
Modified: openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java Mon Apr 4 10:49:25 2016
@@ -47,6 +47,7 @@ public class GenerateWebsiteXsd {
// Get all XML Files of this Folder
FilenameFilter ff = new FilenameFilter() {
+ @Override
public boolean accept(File b, String name) {
File f = new File(b, name);
return f.getName().contains(".xml");
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java Mon Apr 4 10:49:25 2016
@@ -41,7 +41,7 @@ public class NavigationDao {
@PersistenceContext
private EntityManager em;
- public Naviglobal getGlobalMenuEntry(long globalId) {
+ public Naviglobal getGlobalMenuEntry(Long globalId) {
try {
TypedQuery<Naviglobal> query = em.createNamedQuery("getNavigationById", Naviglobal.class);
query.setParameter("id", globalId);
@@ -59,7 +59,7 @@ public class NavigationDao {
.getResultList();
}
- public Naviglobal addGlobalStructure(int naviorder, String labelId, long levelId, String name, String tooltipLabelId) {
+ public Naviglobal addGlobalStructure(int naviorder, String labelId, int levelId, String name, String tooltipLabelId) {
Naviglobal ng = new Naviglobal();
ng.setComment("");
ng.setIcon("");
@@ -77,7 +77,7 @@ public class NavigationDao {
}
public void addMainStructure(String action, String params, int naviorder, String labelId,
- long levelId, String name, long globalId, String tooltipLabelId) {
+ int levelId, String name, Long globalId, String tooltipLabelId) {
Naviglobal ng = getGlobalMenuEntry(globalId);
List<Navimain> mainEntries = ng.getMainnavi();
mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries;
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java Mon Apr 4 10:49:25 2016
@@ -98,7 +98,7 @@ public class LabelDao implements IDataPr
}
public static void add(Locale l) throws Exception {
- Long id = 0L;
+ long id = 0L;
for (Map.Entry<Long, Locale> e : languages.entrySet()) {
id = e.getKey();
}
@@ -182,7 +182,7 @@ public class LabelDao implements IDataPr
}
public static void upload(Locale l, InputStream is) throws Exception {
- List<StringLabel> labels = getLabels(l, is);
+ List<StringLabel> labels = getLabels(is);
URL u = APP.getResource(getLabelFileName(Locale.ENGLISH)); //get the URL of existing resource
File el = new File(u.toURI());
File f = new File(el.getParentFile(), getLabelFileName(l));
@@ -196,23 +196,23 @@ public class LabelDao implements IDataPr
private static List<StringLabel> getLabels(Locale l) {
List<StringLabel> labels = new ArrayList<StringLabel>();
try (InputStream is = APP.getResourceAsStream(getLabelFileName(l))) {
- labels = getLabels(l, is);
+ labels = getLabels(is);
} catch (Exception e) {
log.error("Error reading resources document", e);
}
return labels;
}
- private static List<StringLabel> getLabels(Locale l, InputStream is) throws Exception {
+ private static List<StringLabel> getLabels(InputStream is) throws Exception {
final List<StringLabel> labels = new ArrayList<StringLabel>();
SAXParserFactory spf = SAXParserFactory.newInstance();
- spf.setNamespaceAware(true);
+ spf.setNamespaceAware(true);
try {
- SAXParser parser = spf.newSAXParser();
- XMLReader xr = parser.getXMLReader();
- xr.setContentHandler(new ContentHandler() {
- StringLabel label = null;
-
+ SAXParser parser = spf.newSAXParser();
+ XMLReader xr = parser.getXMLReader();
+ xr.setContentHandler(new ContentHandler() {
+ StringLabel label = null;
+
@Override
public void startPrefixMapping(String prefix, String uri) throws SAXException {}
@@ -265,7 +265,7 @@ public class LabelDao implements IDataPr
return labels;
}
- private List<StringLabel> getLabels(Locale l, final String search) {
+ private static List<StringLabel> getLabels(Locale l, final String search) {
if (labelCache.get(l) == null) {
labelCache.put(l, getLabels(l));
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java Mon Apr 4 10:49:25 2016
@@ -100,7 +100,7 @@ public class SipDao {
return null;
}
- private String getKey(String confno) {
+ private static String getKey(String confno) {
return ASTERISK_OM_KEY + "/" + confno;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java Mon Apr 4 10:49:25 2016
@@ -53,7 +53,7 @@ public interface ISessionManager {
* @param server
* @return
*/
- Client addClientListItem(String streamId, String scopeName, Integer remotePort, String remoteAddress, String swfUrl, Server server);
+ Client addClientListItem(String streamId, String scopeName, int remotePort, String remoteAddress, String swfUrl, Server server);
Collection<Client> getClients();
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ServerDao.java Mon Apr 4 10:49:25 2016
@@ -166,18 +166,18 @@ public class ServerDao implements IDataP
@Override
public Server update(Server entity, Long userId) {
entity.setDeleted(false);
- if (entity.getId() > 0) {
- entity.setUpdated(new Date());
- if (userId != null) {
- entity.setUpdatedby(userDao.get(userId));
- }
- em.merge(entity);
- } else {
+ if (entity.getId() == null) {
entity.setInserted(new Date());
if (userId != null) {
entity.setInsertedby(userDao.get(userId));
}
em.persist(entity);
+ } else {
+ entity.setUpdated(new Date());
+ if (userId != null) {
+ entity.setUpdatedby(userDao.get(userId));
+ }
+ em.merge(entity);
}
return entity;
}
@@ -191,7 +191,7 @@ public class ServerDao implements IDataP
*/
@Override
public void delete(Server entity, Long userId) {
- if (entity.getId() > 0) {
+ if (entity.getId() != null) {
entity.setUpdated(new Date());
if (userId != null) {
entity.setUpdatedby(userDao.get(userId));
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java Mon Apr 4 10:49:25 2016
@@ -138,7 +138,7 @@ public class SessiondataDao {
* @param SID
* @param userId
*/
- public boolean updateUser(String SID, long userId) {
+ public boolean updateUser(String SID, Long userId) {
try {
log.debug("updateUser User: " + userId + " || " + SID);
@@ -174,7 +174,7 @@ public class SessiondataDao {
return false;
}
- public boolean updateUser(String SID, long userId, boolean permanent, Long languageId) {
+ public boolean updateUser(String SID, Long userId, boolean permanent, long languageId) {
try {
log.debug("updateUser User: " + userId + " || " + SID);
TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java Mon Apr 4 10:49:25 2016
@@ -48,7 +48,7 @@ public class PrivateMessageDao implement
public Long addPrivateMessage(String subject, String message, Long parentMessageId,
User from, User to, User owner, Boolean bookedRoom, Room room,
- Boolean isContactRequest, Long userContactId) {
+ boolean isContactRequest, Long userContactId) {
try {
PrivateMessage privateMessage = new PrivateMessage();
privateMessage.setInserted(new Date());
@@ -105,7 +105,7 @@ public class PrivateMessageDao implement
return entity;
}
- private String getQuery(boolean isCount, String search, String orderBy, boolean asc) {
+ private static String getQuery(boolean isCount, String search, String orderBy, boolean asc) {
StringBuilder hql = new StringBuilder("SELECT ");
hql.append(isCount ? "COUNT(" : "").append("m").append(isCount ? ")" : "")
.append(" FROM PrivateMessage m WHERE m.owner.id = :ownerId ")
@@ -157,7 +157,7 @@ public class PrivateMessageDao implement
return query.executeUpdate();
}
- public Integer moveMailsToFolder(Collection<Long> ids, Long folderId) {
+ public int moveMailsToFolder(Collection<Long> ids, Long folderId) {
Query query = em.createNamedQuery("moveMailsToFolder");
query.setParameter("folderId", folderId);
query.setParameter("ids", ids);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Mon Apr 4 10:49:25 2016
@@ -124,11 +124,11 @@ public class UserDao implements IDataPro
return q.getResultList();
}
- private String getAdditionalJoin(boolean filterContacts) {
+ private static String getAdditionalJoin(boolean filterContacts) {
return filterContacts ? "LEFT JOIN u.groupUsers ou" : null;
}
- private String getAdditionalWhere(boolean excludeContacts, Map<String, Object> params) {
+ private static String getAdditionalWhere(boolean excludeContacts, Map<String, Object> params) {
if (excludeContacts) {
params.put("contact", Type.contact);
return "u.type <> :contact";
@@ -136,7 +136,7 @@ public class UserDao implements IDataPro
return null;
}
- private String getAdditionalWhere(boolean filterContacts, Long ownerId, Map<String, Object> params) {
+ private static String getAdditionalWhere(boolean filterContacts, Long ownerId, Map<String, Object> params) {
if (filterContacts) {
params.put("ownerId", ownerId);
params.put("contact", Type.contact);
@@ -146,13 +146,13 @@ public class UserDao implements IDataPro
return null;
}
- private void setAdditionalParams(TypedQuery<?> q, Map<String, Object> params) {
+ private static void setAdditionalParams(TypedQuery<?> q, Map<String, Object> params) {
for (Map.Entry<String, Object> me: params.entrySet()) {
q.setParameter(me.getKey(), me.getValue());
}
}
- public List<User> get(String search, int start, int count, String sort, boolean filterContacts, long currentUserId) {
+ public List<User> get(String search, int start, int count, String sort, boolean filterContacts, Long currentUserId) {
Map<String, Object> params = new HashMap<String, Object>();
TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, false
, getAdditionalWhere(filterContacts, currentUserId, params), sort, searchFields), User.class);
@@ -171,14 +171,14 @@ public class UserDao implements IDataPro
@Override
public long count(String search) {
- return count(search, false, -1);
+ return count(search, false, Long.valueOf(-1));
}
- public long count(String search, long currentUserId) {
+ public long count(String search, Long currentUserId) {
return count(search, false, currentUserId);
}
- public long count(String search, boolean filterContacts, long currentUserId) {
+ public long count(String search, boolean filterContacts, Long currentUserId) {
Map<String, Object> params = new HashMap<String, Object>();
TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, true
, getAdditionalWhere(filterContacts, currentUserId, params), null, searchFields), Long.class);
@@ -197,7 +197,7 @@ public class UserDao implements IDataPro
return q.getResultList();
}
- public List<User> get(String search, boolean filterContacts, long currentUserId) {
+ public List<User> get(String search, boolean filterContacts, Long currentUserId) {
Map<String, Object> params = new HashMap<String, Object>();
TypedQuery<User> q = em.createQuery(DaoHelper.getSearchQuery("User", "u", getAdditionalJoin(filterContacts), search, true, true, false
, getAdditionalWhere(filterContacts, currentUserId, params), null, searchFields), User.class);
@@ -233,7 +233,7 @@ public class UserDao implements IDataPro
// FetchType is Lazy, this extra hook here might be not needed with a
// different mechanism to protect the password from being read
// sebawagner, 01.10.2012
- public User update(User user, String password, long updatedBy) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+ public User update(User user, String password, Long updatedBy) throws NoSuchAlgorithmException, UnsupportedEncodingException {
User u = update(user, updatedBy);
if (u != null && password != null && !password.isEmpty()) {
//OpenJPA is not allowing to set fields not being fetched before
@@ -251,7 +251,7 @@ public class UserDao implements IDataPro
private User get(Long id, boolean force) {
User u = null;
- if (id != null && id > 0) {
+ if (id != null && id.longValue() > 0) {
OpenJPAEntityManager oem = OpenJPAPersistence.cast(em);
boolean qrce = oem.getFetchPlan().getQueryResultCacheEnabled();
try {
@@ -369,7 +369,7 @@ public class UserDao implements IDataPro
u = em.createNamedQuery("getUserByLogin", User.class)
.setParameter("login", login)
.setParameter("type", type)
- .setParameter("domainId", domainId == null ? 0L : domainId)
+ .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId)
.getSingleResult();
} catch (NoResultException ex) {
}
@@ -386,7 +386,7 @@ public class UserDao implements IDataPro
u = em.createNamedQuery("getUserByEmail", User.class)
.setParameter("email", email)
.setParameter("type", type)
- .setParameter("domainId", domainId == null ? 0L : domainId)
+ .setParameter("domainId", domainId == null ? Long.valueOf(0) : domainId)
.getSingleResult();
} catch (NoResultException ex) {
}
@@ -455,11 +455,11 @@ public class UserDao implements IDataPro
return getContact(email, "", "", null, null, owner);
}
- public User getContact(String email, String firstName, String lastName, long ownerId) {
+ public User getContact(String email, String firstName, String lastName, Long ownerId) {
return getContact(email, firstName, lastName, null, null, get(ownerId));
}
- public User getContact(String email, String firstName, String lastName, Long langId, String tzId, long ownerId) {
+ public User getContact(String email, String firstName, String lastName, Long langId, String tzId, Long ownerId) {
return getContact(email, firstName, lastName, langId, tzId, get(ownerId));
}
@@ -504,7 +504,7 @@ public class UserDao implements IDataPro
return u;
}
- private <T> TypedQuery<T> getUserProfileQuery(Class<T> clazz, long userId, String text, String offers, String search, String orderBy, boolean asc) {
+ private <T> TypedQuery<T> getUserProfileQuery(Class<T> clazz, Long userId, String text, String offers, String search, String orderBy, boolean asc) {
Map<String, Object> params = new HashMap<String, Object>();
boolean filterContacts = true;
boolean count = clazz.isAssignableFrom(Long.class);
@@ -537,15 +537,15 @@ public class UserDao implements IDataPro
return query;
}
- private String getStringParam(String param) {
+ private static String getStringParam(String param) {
return param == null ? "%" : "%" + StringUtils.lowerCase(param) + "%";
}
- public List<User> searchUserProfile(long userId, String text, String offers, String search, String orderBy, int start, int max, boolean asc) {
+ public List<User> searchUserProfile(Long userId, String text, String offers, String search, String orderBy, int start, int max, boolean asc) {
return getUserProfileQuery(User.class, userId, text, offers, search, orderBy, asc).setFirstResult(start).setMaxResults(max).getResultList();
}
- public Long searchCountUserProfile(long userId, String text, String offers, String search) {
+ public Long searchCountUserProfile(Long userId, String text, String offers, String search) {
return getUserProfileQuery(Long.class, userId, text, offers, search, null, false).getSingleResult();
}
@@ -561,8 +561,9 @@ public class UserDao implements IDataPro
return u;
}
+ @Override
public List<User> get(String search, int start, int count, String order) {
- return get(search, start, count, order, false, -1);
+ return get(search, start, count, order, false, -1L);
}
public Set<Right> getRights(Long id) {
@@ -637,8 +638,8 @@ public class UserDao implements IDataPro
public User addUser(Set<Right> rights, String firstname, String login, String lastname, long languageId,
String userpass, Address adress, boolean sendSMS, Date age, String hash, TimeZone timezone,
- Boolean forceTimeZoneCheck, String userOffers, String userSearchs, Boolean showContactData,
- Boolean showContactDataToContacts, String externalId, String externalType, List<GroupUser> orgList, String pictureuri) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+ boolean forceTimeZoneCheck, String userOffers, String userSearchs, boolean showContactData,
+ boolean showContactDataToContacts, String externalId, String externalType, List<GroupUser> orgList, String pictureuri) throws NoSuchAlgorithmException, UnsupportedEncodingException {
User u = new User();
u.setFirstname(firstname);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java Mon Apr 4 10:49:25 2016
@@ -45,6 +45,7 @@ public class InvitationDTO implements Se
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(InvitationDTO.class, webAppRootKey);
private static ThreadLocal<SimpleDateFormat> SDF = new ThreadLocal<SimpleDateFormat>() {
+ @Override
protected SimpleDateFormat initialValue() {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
};
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomCountBean.java Mon Apr 4 10:49:25 2016
@@ -19,17 +19,17 @@
package org.apache.openmeetings.db.dto.room;
public class RoomCountBean {
- private long roomId;
+ private Long roomId;
private String roomName;
- private Integer roomCount;
- private Integer maxUser;
+ private int roomCount;
+ private long maxUser;
public RoomCountBean() {}
- public long getRoomId() {
+ public Long getRoomId() {
return roomId;
}
- public void setRoomId(long roomId) {
+ public void setRoomId(Long roomId) {
this.roomId = roomId;
}
public String getRoomName() {
@@ -38,16 +38,16 @@ public class RoomCountBean {
public void setRoomName(String roomName) {
this.roomName = roomName;
}
- public Integer getRoomCount() {
+ public int getRoomCount() {
return roomCount;
}
- public void setRoomCount(Integer roomCount) {
+ public void setRoomCount(int roomCount) {
this.roomCount = roomCount;
}
- public Integer getMaxUser() {
+ public long getMaxUser() {
return maxUser;
}
- public void setMaxUser(Integer maxUser) {
+ public void setMaxUser(long maxUser) {
this.maxUser = maxUser;
}
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomStatus.java Mon Apr 4 10:49:25 2016
@@ -26,7 +26,7 @@ public class RoomStatus {
List<Client> clientList;
BrowserStatus browserStatus;
- Boolean roomFull = false;
+ boolean roomFull = false;
public RoomStatus() {}
@@ -42,10 +42,10 @@ public class RoomStatus {
public void setBrowserStatus(BrowserStatus browserStatus) {
this.browserStatus = browserStatus;
}
- public Boolean getRoomFull() {
+ public boolean getRoomFull() {
return roomFull;
}
- public void setRoomFull(Boolean roomFull) {
+ public void setRoomFull(boolean roomFull) {
this.roomFull = roomFull;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ChatMessage.java Mon Apr 4 10:49:25 2016
@@ -93,10 +93,12 @@ public class ChatMessage implements IDat
@Element(name = "needModeration", data = true, required = false)
private boolean needModeration;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Mon Apr 4 10:49:25 2016
@@ -117,10 +117,12 @@ public class Configuration implements ID
this.value = value;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java Mon Apr 4 10:49:25 2016
@@ -64,10 +64,12 @@ public class ErrorValue implements IData
@Column(name = "deleted")
private boolean deleted;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Mon Apr 4 10:49:25 2016
@@ -110,10 +110,12 @@ public class MailMessage implements IDat
this.ics = ics;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Mon Apr 4 10:49:25 2016
@@ -69,10 +69,10 @@ public class Naviglobal implements IData
private String comment;
@Column(name = "naviorder")
- private Integer naviorder;
+ private int naviorder;
@Column(name = "level_id")
- private Long levelId;
+ private int levelId;
@Column(name = "deleted")
private boolean deleted;
@@ -89,10 +89,12 @@ public class Naviglobal implements IData
@OrderBy("naviorder")
private List<Navimain> mainnavi;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
@@ -145,19 +147,19 @@ public class Naviglobal implements IData
this.name = name;
}
- public Integer getNaviorder() {
+ public int getNaviorder() {
return naviorder;
}
- public void setNaviorder(Integer naviorder) {
+ public void setNaviorder(int naviorder) {
this.naviorder = naviorder;
}
- public Long getLevelId() {
+ public int getLevelId() {
return levelId;
}
- public void setLevelId(Long levelId) {
+ public void setLevelId(int levelId) {
this.levelId = levelId;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Mon Apr 4 10:49:25 2016
@@ -64,10 +64,10 @@ public class Navimain implements IDataPr
private String comment;
@Column(name = "naviorder")
- private Integer naviorder;
+ private int naviorder;
@Column(name = "level_id")
- private Long levelId;
+ private int levelId;
@Column(name = "label_id")
private String labelId;
@@ -78,10 +78,12 @@ public class Navimain implements IDataPr
@Column(name = "tooltip_label_id")
private String tooltipLabelId;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
@@ -94,11 +96,11 @@ public class Navimain implements IDataPr
this.action = action;
}
- public Long getLevelId() {
+ public int getLevelId() {
return levelId;
}
- public void setLevelId(Long levelId) {
+ public void setLevelId(int levelId) {
this.levelId = levelId;
}
@@ -158,11 +160,11 @@ public class Navimain implements IDataPr
this.name = name;
}
- public Integer getNaviorder() {
+ public int getNaviorder() {
return naviorder;
}
- public void setNaviorder(Integer naviorder) {
+ public void setNaviorder(int naviorder) {
this.naviorder = naviorder;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Mon Apr 4 10:49:25 2016
@@ -253,10 +253,12 @@ public class Appointment implements IDat
@Column(name = "is_reminder_email_send")
private boolean reminderEmailSend;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Mon Apr 4 10:49:25 2016
@@ -92,10 +92,12 @@ public class MeetingMember implements ID
@Column(name = "is_connected_event")
private boolean connectedEvent;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileExplorerItem.java Mon Apr 4 10:49:25 2016
@@ -69,10 +69,12 @@ public class FileExplorerItem extends Fi
@Column(name = "external_type")
private String externalType;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/log/ConferenceLog.java Mon Apr 4 10:49:25 2016
@@ -73,9 +73,11 @@ public class ConferenceLog implements ID
@Column(name="scopename")
private String scopeName;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Mon Apr 4 10:49:25 2016
@@ -168,10 +168,12 @@ public class Recording extends FileItem
@Transient
private List<RecordingLog> log;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingLog.java Mon Apr 4 10:49:25 2016
@@ -69,9 +69,11 @@ public class RecordingLog implements IDa
@Column(name="exit_value")
private String exitValue;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java Mon Apr 4 10:49:25 2016
@@ -148,10 +148,12 @@ public class RecordingMetaData implement
@Enumerated(EnumType.STRING)
private Status streamStatus = Status.NONE;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java Mon Apr 4 10:49:25 2016
@@ -94,9 +94,11 @@ public class RecordingMetaDelta implemen
@Column(name="debug_status")
private String debugStatus;
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Mon Apr 4 10:49:25 2016
@@ -138,31 +138,31 @@ public class Client implements IDataProv
* @see Client#getIsSuperModerator()
*/
@Column(name = "is_supermoderator")
- private Boolean isSuperModerator = false;
+ private boolean isSuperModerator = false;
/**
* @see Client#getCanDraw()
*/
@Column(name = "can_draw")
- private Boolean canDraw = false;
+ private boolean canDraw = false;
/**
* @see Client#getCanShare()
*/
@Column(name = "can_share")
- private Boolean canShare = false;
+ private boolean canShare = false;
/**
* @see Client#getCanRemote()
*/
@Column(name = "can_remote")
- private Boolean canRemote = false;
+ private boolean canRemote = false;
/**
* @see Client#getCanGiveAudio()
*/
@Column(name = "can_giveaudio")
- private Boolean canGiveAudio = false;
+ private boolean canGiveAudio = false;
@Column(name = "can_video")
private boolean canVideo = false;
@@ -292,7 +292,7 @@ public class Client implements IDataProv
* @see Client#getIsRecording()
*/
@Column(name = "is_recording")
- private Boolean isRecording = false;
+ private boolean isRecording = false;
/**
* @see Client#getRoomRecordingName()
@@ -340,7 +340,7 @@ public class Client implements IDataProv
* @see Client#getIsBroadcasting()
*/
@Column(name = "is_broadcasting")
- private Boolean isBroadcasting = false;
+ private boolean isBroadcasting = false;
/**
* @see Client#getExternalUserId()
@@ -370,13 +370,13 @@ public class Client implements IDataProv
* @see Client#getZombieCheckFlag()
*/
@Column(name = "zombie_check_flag")
- private Boolean zombieCheckFlag = false;
+ private boolean zombieCheckFlag = false;
/**
* @see Client#getMicMuted()
*/
@Column(name = "mic_muted")
- private Boolean micMuted = false;
+ private boolean micMuted = false;
/**
* @see Client#isSipTransport()
@@ -421,10 +421,12 @@ public class Client implements IDataProv
this.lastname = lastname;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
@@ -597,11 +599,11 @@ public class Client implements IDataProv
this.roomEnter = roomEnter;
}
- public Boolean getIsRecording() {
+ public boolean getIsRecording() {
return isRecording;
}
- public void setIsRecording(Boolean isRecording) {
+ public void setIsRecording(boolean isRecording) {
this.isRecording = isRecording;
}
@@ -637,43 +639,43 @@ public class Client implements IDataProv
this.publicSID = publicSID;
}
- public Boolean getZombieCheckFlag() {
+ public boolean getZombieCheckFlag() {
return zombieCheckFlag;
}
- public void setZombieCheckFlag(Boolean zombieCheckFlag) {
+ public void setZombieCheckFlag(boolean zombieCheckFlag) {
this.zombieCheckFlag = zombieCheckFlag;
}
- public Boolean getMicMuted() {
+ public boolean getMicMuted() {
return micMuted;
}
- public void setMicMuted(Boolean micMuted) {
+ public void setMicMuted(boolean micMuted) {
this.micMuted = micMuted;
}
- public Boolean getCanDraw() {
+ public boolean getCanDraw() {
return canDraw;
}
- public void setCanDraw(Boolean canDraw) {
+ public void setCanDraw(boolean canDraw) {
this.canDraw = canDraw;
}
- public Boolean getIsBroadcasting() {
+ public boolean getIsBroadcasting() {
return isBroadcasting;
}
- public void setIsBroadcasting(Boolean isBroadcasting) {
+ public void setIsBroadcasting(boolean isBroadcasting) {
this.isBroadcasting = isBroadcasting;
}
- public Boolean getCanShare() {
+ public boolean getCanShare() {
return canShare;
}
- public void setCanShare(Boolean canShare) {
+ public void setCanShare(boolean canShare) {
this.canShare = canShare;
}
@@ -693,11 +695,11 @@ public class Client implements IDataProv
this.externalUserType = externalUserType;
}
- public Boolean getIsSuperModerator() {
+ public boolean getIsSuperModerator() {
return isSuperModerator;
}
- public void setIsSuperModerator(Boolean isSuperModerator) {
+ public void setIsSuperModerator(boolean isSuperModerator) {
this.isSuperModerator = isSuperModerator;
}
@@ -797,19 +799,19 @@ public class Client implements IDataProv
this.interviewPodId = interviewPodId;
}
- public Boolean getCanRemote() {
+ public boolean getCanRemote() {
return canRemote;
}
- public void setCanRemote(Boolean canRemote) {
+ public void setCanRemote(boolean canRemote) {
this.canRemote = canRemote;
}
- public Boolean getCanGiveAudio() {
+ public boolean getCanGiveAudio() {
return canGiveAudio;
}
- public void setCanGiveAudio(Boolean canGiveAudio) {
+ public void setCanGiveAudio(boolean canGiveAudio) {
this.canGiveAudio = canGiveAudio;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Mon Apr 4 10:49:25 2016
@@ -150,10 +150,12 @@ public class Invitation implements IData
appointment = i.appointment;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Mon Apr 4 10:49:25 2016
@@ -165,7 +165,7 @@ public class Room implements IDataProvid
@Column(name = "numberOfPartizipants")
@Element(data = true, required = false)
- private Long numberOfPartizipants = new Long(4);
+ private long numberOfPartizipants = 4L;
@Column(name = "appointment")
@Element(data = true, required = false)
@@ -320,10 +320,12 @@ public class Room implements IDataProvid
this.name = name;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}
@@ -376,11 +378,11 @@ public class Room implements IDataProvid
this.currentusers = currentusers;
}
- public Long getNumberOfPartizipants() {
+ public long getNumberOfPartizipants() {
return numberOfPartizipants;
}
- public void setNumberOfPartizipants(Long numberOfPartizipants) {
+ public void setNumberOfPartizipants(long numberOfPartizipants) {
this.numberOfPartizipants = numberOfPartizipants;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java?rev=1737653&r1=1737652&r2=1737653&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java Mon Apr 4 10:49:25 2016
@@ -115,9 +115,11 @@ public class RoomGroup implements IDataP
this.room = room;
}
+ @Override
public Long getId() {
return id;
}
+ @Override
public void setId(Long id) {
this.id = id;
}