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/11/02 05:00:56 UTC
svn commit: r1767607 [1/2] - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/
branches/3.1.x/ope...
Author: solomax
Date: Wed Nov 2 05:00:55 2016
New Revision: 1767607
URL: http://svn.apache.org/viewvc?rev=1767607&view=rev
Log:
[OPENMEETINGS-1494] primitive boolean fields are made not nullable in DB
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Wed Nov 2 05:00:55 2016
@@ -83,7 +83,7 @@ public class Configuration implements ID
@Element(data = true, required = false)
private String comment;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java Wed Nov 2 05:00:55 2016
@@ -61,7 +61,7 @@ public class ErrorValue implements IData
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Override
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Wed Nov 2 05:00:55 2016
@@ -74,7 +74,7 @@ public class Naviglobal implements IData
@Column(name = "level_id")
private int levelId;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "label_id")
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Wed Nov 2 05:00:55 2016
@@ -72,7 +72,7 @@ public class Navimain implements IDataPr
@Column(name = "label_id")
private String labelId;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "tooltip_label_id")
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Wed Nov 2 05:00:55 2016
@@ -196,7 +196,7 @@ public class Appointment implements IDat
@Element(name = "updated", data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
@@ -239,7 +239,7 @@ public class Appointment implements IDat
@Element(name = "language_id", data = true, required = false)
private Long languageId;
- @Column(name = "is_password_protected")
+ @Column(name = "is_password_protected", nullable = false)
@Element(name = "isPasswordProtected", data = true, required = false)
private boolean passwordProtected;
@@ -247,10 +247,10 @@ public class Appointment implements IDat
@Element(data = true, required = false)
private String password;
- @Column(name = "is_connected_event")
+ @Column(name = "is_connected_event", nullable = false)
private boolean connectedEvent;
- @Column(name = "is_reminder_email_send")
+ @Column(name = "is_reminder_email_send", nullable = false)
private boolean reminderEmailSend;
@Override
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Wed Nov 2 05:00:55 2016
@@ -80,7 +80,7 @@ public class MeetingMember implements ID
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
@@ -89,7 +89,7 @@ public class MeetingMember implements ID
@ForeignKey(enabled = true)
private Invitation invitation;
- @Column(name = "is_connected_event")
+ @Column(name = "is_connected_event", nullable = false)
private boolean connectedEvent;
@Override
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java Wed Nov 2 05:00:55 2016
@@ -74,7 +74,7 @@ public abstract class FileItem implement
@Element(data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java Wed Nov 2 05:00:55 2016
@@ -41,10 +41,11 @@ public class StringLabel extends SimpleE
@Override
public boolean equals(Object o) {
- if (!(o instanceof Map.Entry))
- return false;
- Map.Entry<?,?> e = (Map.Entry<?,?>)o;
- return getKey() == null ? e.getKey() == null : getKey().equals(e.getKey());
+ if (!(o instanceof Map.Entry)) {
+ return false;
+ }
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ return getKey() == null ? e.getKey() == null : getKey().equals(e.getKey());
}
@Override
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Wed Nov 2 05:00:55 2016
@@ -155,7 +155,7 @@ public class Recording extends FileItem
@Element(data = true, required = false)
private Long groupId;
- @Column(name = "is_interview")
+ @Column(name = "is_interview", nullable = false)
@Element(data = true, required = false)
private boolean interview;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java Wed Nov 2 05:00:55 2016
@@ -97,15 +97,15 @@ public class RecordingMetaData implement
@Element(data = true)
private String freeTextUserName;
- @Column(name = "is_audio_only")
+ @Column(name = "is_audio_only", nullable = false)
@Element(name = "isAudioOnly", data = true)
private boolean audioOnly;
- @Column(name = "is_video_only")
+ @Column(name = "is_video_only", nullable = false)
@Element(name = "isVideoOnly", data = true)
private boolean videoOnly;
- @Column(name = "is_screen_data")
+ @Column(name = "is_screen_data", nullable = false)
@Element(name = "isScreenData", data = true)
private boolean screenData;
@@ -121,7 +121,7 @@ public class RecordingMetaData implement
@Element(data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "wav_audio_data")
@@ -132,7 +132,7 @@ public class RecordingMetaData implement
@Element(data = true, required = false)
private String fullWavAudioData;
- @Column(name = "audio_is_valid")
+ @Column(name = "audio_is_valid", nullable = false)
@Element(name="audioIsValid", data = true, required = false)
private boolean audioValid;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java Wed Nov 2 05:00:55 2016
@@ -85,10 +85,10 @@ public class RecordingMetaDelta implemen
@Column(name="received_audio_data_length")
private Long receivedAudioDataLength;
- @Column(name="is_end_padding")
+ @Column(name="is_end_padding", nullable = false)
private boolean endPadding;
- @Column(name="is_start_padding")
+ @Column(name="is_start_padding", nullable = false)
private boolean startPadding;
@Column(name="debug_status")
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Wed Nov 2 05:00:55 2016
@@ -131,40 +131,40 @@ public class Client implements IDataProv
/**
* @see Client#getIsMod()
*/
- @Column(name = "is_mod")
+ @Column(name = "is_mod", nullable = false)
private boolean isMod = false;
/**
* @see Client#getIsSuperModerator()
*/
- @Column(name = "is_supermoderator")
+ @Column(name = "is_supermoderator", nullable = false)
private boolean isSuperModerator = false;
/**
* @see Client#getCanDraw()
*/
- @Column(name = "can_draw")
+ @Column(name = "can_draw", nullable = false)
private boolean canDraw = false;
/**
* @see Client#getCanShare()
*/
- @Column(name = "can_share")
+ @Column(name = "can_share", nullable = false)
private boolean canShare = false;
/**
* @see Client#getCanRemote()
*/
- @Column(name = "can_remote")
+ @Column(name = "can_remote", nullable = false)
private boolean canRemote = false;
/**
* @see Client#getCanGiveAudio()
*/
- @Column(name = "can_giveaudio")
+ @Column(name = "can_giveaudio", nullable = false)
private boolean canGiveAudio = false;
- @Column(name = "can_video")
+ @Column(name = "can_video", nullable = false)
private boolean canVideo = false;
/**
@@ -182,7 +182,7 @@ public class Client implements IDataProv
/**
* @see Client#isScreenClient()
*/
- @Column(name = "is_screenclient")
+ @Column(name = "is_screenclient", nullable = false)
private boolean screenClient;
/**
@@ -291,13 +291,13 @@ public class Client implements IDataProv
@Column(name = "tcurl", length=2048)
private String tcUrl;
- @Column(name = "nativeSsl")
+ @Column(name = "nativeSsl", nullable = false)
private boolean nativeSsl = false;
/**
* @see Client#getIsRecording()
*/
- @Column(name = "is_recording")
+ @Column(name = "is_recording", nullable = false)
private boolean isRecording = false;
/**
@@ -321,31 +321,31 @@ public class Client implements IDataProv
/**
* @see Client#isStartRecording()
*/
- @Column(name = "start_recording")
+ @Column(name = "start_recording", nullable = false)
private boolean startRecording = false;
/**
* @see Client#isStartStreaming()
*/
- @Column(name = "start_streaming")
+ @Column(name = "start_streaming", nullable = false)
private boolean startStreaming = false;
/**
* @see Client#isScreenPublishStarted()
*/
- @Column(name = "screen_publish_started")
+ @Column(name = "screen_publish_started", nullable = false)
private boolean screenPublishStarted = false;
/**
* @see Client#isStreamPublishStarted()
*/
- @Column(name = "stream_publish_started")
+ @Column(name = "stream_publish_started", nullable = false)
private boolean streamPublishStarted = false;
/**
* @see Client#getIsBroadcasting()
*/
- @Column(name = "is_broadcasting")
+ @Column(name = "is_broadcasting", nullable = false)
private boolean isBroadcasting = false;
/**
@@ -369,36 +369,36 @@ public class Client implements IDataProv
/**
* @see Client#isAllowRecording()
*/
- @Column(name = "allow_recording")
+ @Column(name = "allow_recording", nullable = false)
private boolean allowRecording = true;
/**
* @see Client#getZombieCheckFlag()
*/
- @Column(name = "zombie_check_flag")
+ @Column(name = "zombie_check_flag", nullable = false)
private boolean zombieCheckFlag = false;
/**
* @see Client#getMicMuted()
*/
- @Column(name = "mic_muted")
+ @Column(name = "mic_muted", nullable = false)
private boolean micMuted = false;
/**
* @see Client#isSipTransport()
*/
- @Column(name = "sip_transport")
+ @Column(name = "sip_transport", nullable = false)
private boolean sipTransport = false;
- @Column(name = "mobile")
+ @Column(name = "mobile", nullable = false)
private boolean mobile = false;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
-
+
public Client() {}
-
+
public Client(String streamid, String publicSID, Long roomId,
Long userId, String firstname, String lastname,
String username, String connectedSince, String scope) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Wed Nov 2 05:00:55 2016
@@ -84,7 +84,7 @@ public class Invitation implements IData
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@ManyToOne(fetch = FetchType.EAGER)
@@ -106,7 +106,7 @@ public class Invitation implements IData
@ForeignKey(enabled = true)
private User invitee;
- @Column(name = "password_protected")
+ @Column(name = "password_protected", nullable = false)
private boolean passwordProtected;
@Column(name = "password", length = 1024)
@@ -124,7 +124,7 @@ public class Invitation implements IData
@Column(name = "valid_to")
private Date validTo;
- @Column(name = "was_used")
+ @Column(name = "was_used", nullable = false)
private boolean used;
@ManyToOne(fetch = FetchType.EAGER)
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Wed Nov 2 05:00:55 2016
@@ -168,11 +168,11 @@ public class Room implements IDataProvid
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
- @Column(name = "ispublic")
+ @Column(name = "ispublic", nullable = false)
@Element(name = "ispublic", data = true, required = false)
private boolean ispublic;
@@ -180,7 +180,7 @@ public class Room implements IDataProvid
@Element(data = true, required = false)
private long numberOfPartizipants = 4L;
- @Column(name = "appointment")
+ @Column(name = "appointment", nullable = false)
@Element(data = true, required = false)
private boolean appointment;
@@ -193,7 +193,7 @@ public class Room implements IDataProvid
@Element(data = true, required = false)
private String externalType;
- @Column(name = "demo_room")
+ @Column(name = "demo_room", nullable = false)
@Element(name = "isDemoRoom", data = true, required = false)
private boolean demoRoom;
@@ -203,15 +203,15 @@ public class Room implements IDataProvid
// If this is true all participants of a meeting have to wait for the
// moderator to come into the room
- @Column(name = "ismoderatedroom")
+ @Column(name = "ismoderatedroom", nullable = false)
@Element(name="isModeratedRoom", data = true, required = false)
private boolean moderated;
- @Column(name = "allow_user_questions")
+ @Column(name = "allow_user_questions", nullable = false)
@Element(data = true, required = false)
private boolean allowUserQuestions;
- @Column(name = "is_audio_only")
+ @Column(name = "is_audio_only", nullable = false)
@Element(name = "isAudioOnly", data = true, required = false)
private boolean audioOnly;
@@ -219,7 +219,7 @@ public class Room implements IDataProvid
@Element(data = true, required = false)
private boolean allowFontStyles = false;
- @Column(name = "is_closed")
+ @Column(name = "is_closed", nullable = false)
@Element(data = true, required = false)
private boolean closed;
@@ -231,62 +231,62 @@ public class Room implements IDataProvid
@Element(name = "ownerid", data = true, required = false)
private Long ownerId; // Those are the rooms from the myrooms section
- @Column(name = "wait_for_recording")
+ @Column(name = "wait_for_recording", nullable = false)
@Element(data = true, required = false)
private boolean waitForRecording; // Show warning that user has to start
// recording
- @Column(name = "allow_recording")
+ @Column(name = "allow_recording", nullable = false)
@Element(name = "allowRecording", data = true, required = false)
private boolean allowRecording = true; // Show or show not the recording option in a conference room
/**
* Layout of Room
*/
- @Column(name = "hide_top_bar")
+ @Column(name = "hide_top_bar", nullable = false)
@Element(data = true, required = false)
private boolean hideTopBar;
- @Column(name = "hide_chat")
+ @Column(name = "hide_chat", nullable = false)
@Element(name = "hideChat", data = true, required = false)
private boolean chatHidden;
- @Column(name = "hide_activities_and_actions")
+ @Column(name = "hide_activities_and_actions", nullable = false)
@Element(name = "hideActivitiesAndActions", data = true, required = false)
private boolean activitiesHidden;
- @Column(name = "hide_files_explorer")
+ @Column(name = "hide_files_explorer", nullable = false)
@Element(data = true, required = false)
private boolean hideFilesExplorer;
- @Column(name = "hide_actions_menu")
+ @Column(name = "hide_actions_menu", nullable = false)
@Element(data = true, required = false)
private boolean hideActionsMenu;
- @Column(name = "hide_screen_sharing")
+ @Column(name = "hide_screen_sharing", nullable = false)
@Element(data = true, required = false)
private boolean hideScreenSharing;
- @Column(name = "hide_whiteboard")
+ @Column(name = "hide_whiteboard", nullable = false)
@Element(data = true, required = false)
private boolean hideWhiteboard;
- @Column(name = "show_microphone_status")
+ @Column(name = "show_microphone_status", nullable = false)
@Element(data = true, required = false)
private boolean showMicrophoneStatus;
- @Column(name = "chat_moderated")
+ @Column(name = "chat_moderated", nullable = false)
@Element(data = true, required = false)
private boolean chatModerated;
- @Column(name = "chat_opened")
+ @Column(name = "chat_opened", nullable = false)
@Element(data = true, required = false)
private boolean chatOpened;
- @Column(name = "files_opened")
+ @Column(name = "files_opened", nullable = false)
@Element(data = true, required = false)
private boolean filesOpened;
- @Column(name = "auto_video_select")
+ @Column(name = "auto_video_select", nullable = false)
@Element(data = true, required = false)
private boolean autoVideoSelect;
@@ -296,7 +296,7 @@ public class Room implements IDataProvid
@ElementList(name = "room_moderators", required=false)
private List<RoomModerator> moderators = new ArrayList<RoomModerator>();
- @Column(name = "sip_enabled")
+ @Column(name = "sip_enabled", nullable = false)
@Element(data = true, required = false)
private boolean sipEnabled;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java Wed Nov 2 05:00:55 2016
@@ -89,7 +89,7 @@ public class RoomGroup implements IDataP
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data=true)
private boolean deleted;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Wed Nov 2 05:00:55 2016
@@ -59,7 +59,7 @@ public class RoomModerator implements Se
@Column(name = "roomId")
private Long roomId;
- @Column(name="is_supermoderator")
+ @Column(name="is_supermoderator", nullable = false)
@Element(name="is_supermoderator", data = true)
private boolean superModerator;
@@ -75,7 +75,7 @@ public class RoomModerator implements Se
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
public Long getId() {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Wed Nov 2 05:00:55 2016
@@ -119,7 +119,7 @@ public class RoomPoll implements IDataPr
@Element(data = true, required = false)
private Date created;
- @Column(name = "archived")
+ @Column(name = "archived", nullable = false)
@Element(data = true, required = false)
private boolean archived;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Wed Nov 2 05:00:55 2016
@@ -63,7 +63,7 @@ public class LdapConfig implements IData
@Element(data = true, required = false)
private String configFileName;
- @Column(name = "add_domain_to_user_name")
+ @Column(name = "add_domain_to_user_name", nullable = false)
@Element(data = true)
private boolean addDomainToUserName;
@@ -71,7 +71,7 @@ public class LdapConfig implements IData
@Element(data = true, required = false)
private String domain;
- @Column(name = "is_active")
+ @Column(name = "is_active", nullable = false)
@Element(data = true, name = "isActive")
private boolean active;
@@ -91,7 +91,7 @@ public class LdapConfig implements IData
@ForeignKey(enabled = true)
private User updatedby;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Lob
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Wed Nov 2 05:00:55 2016
@@ -58,7 +58,7 @@ public class OAuthServer implements IDat
@Element(data = true)
private String iconUrl;
- @Column(name = "enabled")
+ @Column(name = "enabled", nullable = false)
@Element(data = true)
private boolean enabled;
@@ -107,7 +107,7 @@ public class OAuthServer implements IDat
@Element(data = true, required = false)
private String lastnameParamName;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Wed Nov 2 05:00:55 2016
@@ -49,22 +49,22 @@ public class SOAPLogin implements Serial
@Column(name="created")
private Date created;
- @Column(name="used")
+ @Column(name="used", nullable = false)
private boolean used;
@Column(name="use_date")
private Date useDate;
- @Column(name="becomemoderator")
+ @Column(name="becomemoderator", nullable = false)
private boolean becomemoderator;
- @Column(name="showaudiovideotest")
+ @Column(name="showaudiovideotest", nullable = false)
private boolean showAudioVideoTest;
- @Column(name="allow_same_url_multiple_times")
+ @Column(name="allow_same_url_multiple_times", nullable = false)
private boolean allowSameURLMultipleTimes;
- @Column(name="show_nick_name_dialog")
+ @Column(name="show_nick_name_dialog", nullable = false)
private boolean showNickNameDialog;
@Column(name="client_url")
@@ -76,7 +76,7 @@ public class SOAPLogin implements Serial
@Column(name="landing_zone")
private String landingZone;
- @Column(name="allow_recording")
+ @Column(name="allow_recording", nullable = false)
private boolean allowRecording;
public Long getId() {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Wed Nov 2 05:00:55 2016
@@ -120,7 +120,7 @@ public class Server implements IDataProv
@Element(data = true, required = false)
private String pass;
- @Column(name = "active", nullable = true)
+ @Column(name = "active", nullable = false)
@Element(data = true, required = false)
private boolean active;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Wed Nov 2 05:00:55 2016
@@ -62,7 +62,7 @@ public class Sessiondata implements Seri
@Column(name = "xml")
private String xml;
- @Column(name = "permanent")
+ @Column(name = "permanent", nullable = false)
private boolean permanent;
@Column(name = "language_id")
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Address.java Wed Nov 2 05:00:55 2016
@@ -79,7 +79,7 @@ public class Address implements IDataPro
@Element(data=true, required=false)
private String zip;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "email")
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Group.java Wed Nov 2 05:00:55 2016
@@ -70,7 +70,7 @@ public class Group implements IDataProvi
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true, required = false)
private boolean deleted;
@@ -78,7 +78,7 @@ public class Group implements IDataProvi
@Element(data = true, required = false)
private String tag;
- @Column(name = "limited")
+ @Column(name = "limited", nullable = false)
@Element(data = true, required = false)
private boolean limited;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/GroupUser.java Wed Nov 2 05:00:55 2016
@@ -71,7 +71,7 @@ public class GroupUser implements IDataP
@Column(name = "updated")
private Date updated;
- @Column(name = "is_moderator")
+ @Column(name = "is_moderator", nullable = false)
@Element(data = true, required = false)
private boolean moderator;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/PrivateMessage.java Wed Nov 2 05:00:55 2016
@@ -94,7 +94,7 @@ public class PrivateMessage implements I
@Element(data = true, required = false)
private User owner;
- @Column(name = "booked_room")
+ @Column(name = "booked_room", nullable = false)
@Element(data = true)
private boolean bookedRoom;
@@ -104,13 +104,10 @@ public class PrivateMessage implements I
@Element(data = true, required = false)
private Room room;
- @Column(name = "is_read")
+ @Column(name = "is_read", nullable = false)
@Element(data = true)
private boolean isRead;
- @Element(data = true)
- private boolean isTrash;
-
@Column(name = "parent_message_id")
@Element(data = true, required = false)
private Long parentMessage;
@@ -119,7 +116,7 @@ public class PrivateMessage implements I
@Element(data = true, name = "privateMessageFolderId")
private Long folderId;
- @Column(name = "is_contact_request")
+ @Column(name = "is_contact_request", nullable = false)
@Element(data = true)
private boolean isContactRequest;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java Wed Nov 2 05:00:55 2016
@@ -225,7 +225,7 @@ public class User implements IDataProvid
@Element(data = true, required = false)
private String pictureuri;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true, required = false)
private boolean deleted;
@@ -277,11 +277,11 @@ public class User implements IDataProvid
@Transient
private Sessiondata sessionData;
- @Column(name = "forceTimeZoneCheck")
+ @Column(name = "forceTimeZoneCheck", nullable = false)
@Element(data = true, required = false)
private boolean forceTimeZoneCheck;
- @Column(name = "sendSMS")
+ @Column(name = "sendSMS", nullable = false)
@Element(data = false, required = false)
private boolean sendSMS;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/UserContact.java Wed Nov 2 05:00:55 2016
@@ -89,7 +89,7 @@ public class UserContact implements Seri
@Element(data=true, required=false)
private User owner;
- @Column(name="pending")
+ @Column(name="pending", nullable = false)
@Element(data=true)
private boolean pending;
@@ -99,7 +99,7 @@ public class UserContact implements Seri
@Column(name="updated")
private Date updated;
- @Column(name="share_calendar")
+ @Column(name="share_calendar", nullable = false)
@Element(data=true, required=false)
private boolean shareCalendar;
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java Wed Nov 2 05:00:55 2016
@@ -57,7 +57,7 @@ public class Userdata implements Seriali
@Column(name = "comment")
private String comment;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
public String getComment() {
Modified: openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SHA256Implementation.java Wed Nov 2 05:00:55 2016
@@ -39,19 +39,19 @@ public class SHA256Implementation implem
private static final int SALT_LENGTH = 256;
private static byte[] getSalt() throws NoSuchAlgorithmException {
- SecureRandom sr = SecureRandom.getInstance(SECURE_RND_ALG);
- byte[] salt = new byte[SALT_LENGTH];
- sr.nextBytes(salt);
- return salt;
- }
-
+ SecureRandom sr = SecureRandom.getInstance(SECURE_RND_ALG);
+ byte[] salt = new byte[SALT_LENGTH];
+ sr.nextBytes(salt);
+ return salt;
+ }
+
private static String hash(String str, byte[] salt, int iter) {
PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(new SHA256Digest());
gen.init(str.getBytes(StandardCharsets.UTF_8), salt, iter);
byte[] dk = ((KeyParameter) gen.generateDerivedParameters(KEY_LENGTH)).getKey();
return Base64.encodeBase64String(dk);
}
-
+
/*
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICrypt#hash(java.lang.String)
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Wed Nov 2 05:00:55 2016
@@ -83,7 +83,7 @@ public class Configuration implements ID
@Element(data = true, required = false)
private String comment;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java Wed Nov 2 05:00:55 2016
@@ -61,7 +61,7 @@ public class ErrorValue implements IData
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Wed Nov 2 05:00:55 2016
@@ -74,7 +74,7 @@ public class Naviglobal implements IData
@Column(name = "level_id")
private int levelId;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "label_id")
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Wed Nov 2 05:00:55 2016
@@ -72,7 +72,7 @@ public class Navimain implements IDataPr
@Column(name = "label_id")
private String labelId;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "tooltip_label_id")
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Wed Nov 2 05:00:55 2016
@@ -204,7 +204,7 @@ public class Appointment implements IDat
@Element(name = "updated", data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
@@ -247,7 +247,7 @@ public class Appointment implements IDat
@Element(name = "language_id", data = true, required = false)
private Long languageId;
- @Column(name = "is_password_protected")
+ @Column(name = "is_password_protected", nullable = false)
@Element(name = "isPasswordProtected", data = true, required = false)
private boolean passwordProtected;
@@ -255,10 +255,10 @@ public class Appointment implements IDat
@Element(data = true, required = false)
private String password;
- @Column(name = "is_connected_event")
+ @Column(name = "is_connected_event", nullable = false)
private boolean connectedEvent;
- @Column(name = "is_reminder_email_send")
+ @Column(name = "is_reminder_email_send", nullable = false)
private boolean reminderEmailSend;
//Calendar Specific fields.
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java Wed Nov 2 05:00:55 2016
@@ -80,7 +80,7 @@ public class MeetingMember implements ID
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
@@ -89,7 +89,7 @@ public class MeetingMember implements ID
@ForeignKey(enabled = true)
private Invitation invitation;
- @Column(name = "is_connected_event")
+ @Column(name = "is_connected_event", nullable = false)
private boolean connectedEvent;
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java Wed Nov 2 05:00:55 2016
@@ -84,7 +84,7 @@ public abstract class FileItem implement
@Element(data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java Wed Nov 2 05:00:55 2016
@@ -41,10 +41,11 @@ public class StringLabel extends SimpleE
@Override
public boolean equals(Object o) {
- if (!(o instanceof Map.Entry))
- return false;
- Map.Entry<?,?> e = (Map.Entry<?,?>)o;
- return getKey() == null ? e.getKey() == null : getKey().equals(e.getKey());
+ if (!(o instanceof Map.Entry)) {
+ return false;
+ }
+ Map.Entry<?,?> e = (Map.Entry<?,?>)o;
+ return getKey() == null ? e.getKey() == null : getKey().equals(e.getKey());
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java Wed Nov 2 05:00:55 2016
@@ -145,7 +145,7 @@ public class Recording extends FileItem
@Element(data = true, required = false)
private Long groupId;
- @Column(name = "is_interview")
+ @Column(name = "is_interview", nullable = false)
@Element(data = true, required = false)
private boolean interview;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaData.java Wed Nov 2 05:00:55 2016
@@ -97,15 +97,15 @@ public class RecordingMetaData implement
@Element(data = true)
private String freeTextUserName;
- @Column(name = "is_audio_only")
+ @Column(name = "is_audio_only", nullable = false)
@Element(name = "isAudioOnly", data = true)
private boolean audioOnly;
- @Column(name = "is_video_only")
+ @Column(name = "is_video_only", nullable = false)
@Element(name = "isVideoOnly", data = true)
private boolean videoOnly;
- @Column(name = "is_screen_data")
+ @Column(name = "is_screen_data", nullable = false)
@Element(name = "isScreenData", data = true)
private boolean screenData;
@@ -121,7 +121,7 @@ public class RecordingMetaData implement
@Element(data = true, required = false)
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Column(name = "wav_audio_data")
@@ -132,7 +132,7 @@ public class RecordingMetaData implement
@Element(data = true, required = false)
private String fullWavAudioData;
- @Column(name = "audio_is_valid")
+ @Column(name = "audio_is_valid", nullable = false)
@Element(name="audioIsValid", data = true, required = false)
private boolean audioValid;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/RecordingMetaDelta.java Wed Nov 2 05:00:55 2016
@@ -85,10 +85,10 @@ public class RecordingMetaDelta implemen
@Column(name="received_audio_data_length")
private Long receivedAudioDataLength;
- @Column(name="is_end_padding")
+ @Column(name="is_end_padding", nullable = false)
private boolean endPadding;
- @Column(name="is_start_padding")
+ @Column(name="is_start_padding", nullable = false)
private boolean startPadding;
@Column(name="debug_status")
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Wed Nov 2 05:00:55 2016
@@ -131,40 +131,40 @@ public class Client implements IDataProv
/**
* @see Client#getIsMod()
*/
- @Column(name = "is_mod")
+ @Column(name = "is_mod", nullable = false)
private boolean isMod = false;
/**
* @see Client#getIsSuperModerator()
*/
- @Column(name = "is_supermoderator")
+ @Column(name = "is_supermoderator", nullable = false)
private boolean isSuperModerator = false;
/**
* @see Client#getCanDraw()
*/
- @Column(name = "can_draw")
+ @Column(name = "can_draw", nullable = false)
private boolean canDraw = false;
/**
* @see Client#getCanShare()
*/
- @Column(name = "can_share")
+ @Column(name = "can_share", nullable = false)
private boolean canShare = false;
/**
* @see Client#getCanRemote()
*/
- @Column(name = "can_remote")
+ @Column(name = "can_remote", nullable = false)
private boolean canRemote = false;
/**
* @see Client#getCanGiveAudio()
*/
- @Column(name = "can_giveaudio")
+ @Column(name = "can_giveaudio", nullable = false)
private boolean canGiveAudio = false;
- @Column(name = "can_video")
+ @Column(name = "can_video", nullable = false)
private boolean canVideo = false;
/**
@@ -182,7 +182,7 @@ public class Client implements IDataProv
/**
* @see Client#isScreenClient()
*/
- @Column(name = "is_screenclient")
+ @Column(name = "is_screenclient", nullable = false)
private boolean screenClient;
/**
@@ -291,13 +291,13 @@ public class Client implements IDataProv
@Column(name = "tcurl", length=2048)
private String tcUrl;
- @Column(name = "nativeSsl")
+ @Column(name = "nativeSsl", nullable = false)
private boolean nativeSsl = false;
/**
* @see Client#getIsRecording()
*/
- @Column(name = "is_recording")
+ @Column(name = "is_recording", nullable = false)
private boolean isRecording = false;
/**
@@ -321,31 +321,31 @@ public class Client implements IDataProv
/**
* @see Client#isStartRecording()
*/
- @Column(name = "start_recording")
+ @Column(name = "start_recording", nullable = false)
private boolean startRecording = false;
/**
* @see Client#isStartStreaming()
*/
- @Column(name = "start_streaming")
+ @Column(name = "start_streaming", nullable = false)
private boolean startStreaming = false;
/**
* @see Client#isScreenPublishStarted()
*/
- @Column(name = "screen_publish_started")
+ @Column(name = "screen_publish_started", nullable = false)
private boolean screenPublishStarted = false;
/**
* @see Client#isStreamPublishStarted()
*/
- @Column(name = "stream_publish_started")
+ @Column(name = "stream_publish_started", nullable = false)
private boolean streamPublishStarted = false;
/**
* @see Client#getIsBroadcasting()
*/
- @Column(name = "is_broadcasting")
+ @Column(name = "is_broadcasting", nullable = false)
private boolean isBroadcasting = false;
/**
@@ -369,36 +369,36 @@ public class Client implements IDataProv
/**
* @see Client#isAllowRecording()
*/
- @Column(name = "allow_recording")
+ @Column(name = "allow_recording", nullable = false)
private boolean allowRecording = true;
/**
* @see Client#getZombieCheckFlag()
*/
- @Column(name = "zombie_check_flag")
+ @Column(name = "zombie_check_flag", nullable = false)
private boolean zombieCheckFlag = false;
/**
* @see Client#getMicMuted()
*/
- @Column(name = "mic_muted")
+ @Column(name = "mic_muted", nullable = false)
private boolean micMuted = false;
/**
* @see Client#isSipTransport()
*/
- @Column(name = "sip_transport")
+ @Column(name = "sip_transport", nullable = false)
private boolean sipTransport = false;
- @Column(name = "mobile")
+ @Column(name = "mobile", nullable = false)
private boolean mobile = false;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "server_id")
private Server server;
-
+
public Client() {}
-
+
public Client(String streamid, String publicSID, Long roomId,
Long userId, String firstname, String lastname,
String username, String connectedSince, String scope) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java Wed Nov 2 05:00:55 2016
@@ -84,7 +84,7 @@ public class Invitation implements IData
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@ManyToOne(fetch = FetchType.EAGER)
@@ -106,7 +106,7 @@ public class Invitation implements IData
@ForeignKey(enabled = true)
private User invitee;
- @Column(name = "password_protected")
+ @Column(name = "password_protected", nullable = false)
private boolean passwordProtected;
@Column(name = "password", length = 1024)
@@ -124,7 +124,7 @@ public class Invitation implements IData
@Column(name = "valid_to")
private Date validTo;
- @Column(name = "was_used")
+ @Column(name = "was_used", nullable = false)
private boolean used;
@ManyToOne(fetch = FetchType.EAGER)
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Wed Nov 2 05:00:55 2016
@@ -185,11 +185,11 @@ public class Room implements IDataProvid
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
- @Column(name = "ispublic")
+ @Column(name = "ispublic", nullable = false)
@Element(name = "ispublic", data = true, required = false)
private boolean ispublic;
@@ -197,7 +197,7 @@ public class Room implements IDataProvid
@Element(data = true, required = false)
private long numberOfPartizipants = 4L;
- @Column(name = "appointment")
+ @Column(name = "appointment", nullable = false)
@Element(data = true, required = false)
private boolean appointment;
@@ -210,7 +210,7 @@ public class Room implements IDataProvid
@Element(data = true, required = false)
private String externalType;
- @Column(name = "demo_room")
+ @Column(name = "demo_room", nullable = false)
@Element(name = "isDemoRoom", data = true, required = false)
private boolean demoRoom;
@@ -220,19 +220,19 @@ public class Room implements IDataProvid
// If this is true all participants of a meeting have to wait for the
// moderator to come into the room
- @Column(name = "ismoderatedroom")
+ @Column(name = "ismoderatedroom", nullable = false)
@Element(name="isModeratedRoom", data = true, required = false)
private boolean moderated;
- @Column(name = "allow_user_questions")
+ @Column(name = "allow_user_questions", nullable = false)
@Element(data = true, required = false)
private boolean allowUserQuestions;
- @Column(name = "is_audio_only")
+ @Column(name = "is_audio_only", nullable = false)
@Element(name = "isAudioOnly", data = true, required = false)
private boolean audioOnly;
- @Column(name = "is_closed")
+ @Column(name = "is_closed", nullable = false)
@Element(data = true, required = false)
private boolean closed;
@@ -244,16 +244,16 @@ public class Room implements IDataProvid
@Element(name = "ownerid", data = true, required = false)
private Long ownerId; // Those are the rooms from the myrooms section
- @Column(name = "wait_for_recording")
+ @Column(name = "wait_for_recording", nullable = false)
@Element(data = true, required = false)
private boolean waitForRecording; // Show warning that user has to start
// recording
- @Column(name = "allow_recording")
+ @Column(name = "allow_recording", nullable = false)
@Element(name = "allowRecording", data = true, required = false)
private boolean allowRecording = true; // Show or show not the recording option in a conference room
-
- @Column(name = "chat_moderated")
+
+ @Column(name = "chat_moderated", nullable = false)
@Element(data = true, required = false)
private boolean chatModerated;
@@ -266,16 +266,16 @@ public class Room implements IDataProvid
@Enumerated(EnumType.STRING)
@ElementList(name="hide_element", data = true, required = false)
private Set<RoomElement> hiddenElements = new HashSet<>();
-
- @Column(name = "chat_opened")
+
+ @Column(name = "chat_opened", nullable = false)
@Element(data = true, required = false)
private boolean chatOpened;
- @Column(name = "files_opened")
+ @Column(name = "files_opened", nullable = false)
@Element(data = true, required = false)
private boolean filesOpened;
- @Column(name = "auto_video_select")
+ @Column(name = "auto_video_select", nullable = false)
@Element(data = true, required = false)
private boolean autoVideoSelect;
@@ -285,7 +285,7 @@ public class Room implements IDataProvid
@ElementList(name = "room_moderators", required=false)
private List<RoomModerator> moderators = new ArrayList<RoomModerator>();
- @Column(name = "sip_enabled")
+ @Column(name = "sip_enabled", nullable = false)
@Element(data = true, required = false)
private boolean sipEnabled;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomGroup.java Wed Nov 2 05:00:55 2016
@@ -89,7 +89,7 @@ public class RoomGroup implements IDataP
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data=true)
private boolean deleted;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomModerator.java Wed Nov 2 05:00:55 2016
@@ -59,7 +59,7 @@ public class RoomModerator implements Se
@Column(name = "roomId")
private Long roomId;
- @Column(name="is_supermoderator")
+ @Column(name="is_supermoderator", nullable = false)
@Element(name="is_supermoderator", data = true)
private boolean superModerator;
@@ -75,7 +75,7 @@ public class RoomModerator implements Se
@Column(name = "updated")
private Date updated;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
public Long getId() {
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPoll.java Wed Nov 2 05:00:55 2016
@@ -119,7 +119,7 @@ public class RoomPoll implements IDataPr
@Element(data = true, required = false)
private Date created;
- @Column(name = "archived")
+ @Column(name = "archived", nullable = false)
@Element(data = true, required = false)
private boolean archived;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java Wed Nov 2 05:00:55 2016
@@ -63,7 +63,7 @@ public class LdapConfig implements IData
@Element(data = true, required = false)
private String configFileName;
- @Column(name = "add_domain_to_user_name")
+ @Column(name = "add_domain_to_user_name", nullable = false)
@Element(data = true)
private boolean addDomainToUserName;
@@ -71,7 +71,7 @@ public class LdapConfig implements IData
@Element(data = true, required = false)
private String domain;
- @Column(name = "is_active")
+ @Column(name = "is_active", nullable = false)
@Element(data = true, name = "isActive")
private boolean active;
@@ -91,7 +91,7 @@ public class LdapConfig implements IData
@ForeignKey(enabled = true)
private User updatedby;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
private boolean deleted;
@Lob
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java Wed Nov 2 05:00:55 2016
@@ -58,7 +58,7 @@ public class OAuthServer implements IDat
@Element(data = true)
private String iconUrl;
- @Column(name = "enabled")
+ @Column(name = "enabled", nullable = false)
@Element(data = true)
private boolean enabled;
@@ -107,7 +107,7 @@ public class OAuthServer implements IDat
@Element(data = true, required = false)
private String lastnameParamName;
- @Column(name = "deleted")
+ @Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted;
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java Wed Nov 2 05:00:55 2016
@@ -49,19 +49,19 @@ public class SOAPLogin implements Serial
@Column(name="created")
private Date created;
- @Column(name="used")
+ @Column(name="used", nullable = false)
private boolean used;
@Column(name="use_date")
private Date useDate;
- @Column(name="moderator")
+ @Column(name="moderator", nullable = false)
private boolean moderator;
- @Column(name="showaudiovideotest")
+ @Column(name="showaudiovideotest", nullable = false)
private boolean showAudioVideoTest;
- @Column(name="allow_same_url_multiple_times")
+ @Column(name="allow_same_url_multiple_times", nullable = false)
private boolean allowSameURLMultipleTimes;
@Column(name="client_url")
@@ -73,7 +73,7 @@ public class SOAPLogin implements Serial
@Column(name="landing_zone")
private String landingZone;
- @Column(name="allow_recording")
+ @Column(name="allow_recording", nullable = false)
private boolean allowRecording;
public Long getId() {
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1767607&r1=1767606&r2=1767607&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Wed Nov 2 05:00:55 2016
@@ -120,7 +120,7 @@ public class Server implements IDataProv
@Element(data = true, required = false)
private String pass;
- @Column(name = "active", nullable = true)
+ @Column(name = "active", nullable = false)
@Element(data = true, required = false)
private boolean active;