Author: eric Date: Fri Jan 14 10:46:48 2011 New Revision: 1058935 URL: http://svn.apache.org/viewvc?rev=1058935&view=rev Log: Set correct nullable property on columns (MAILBOX-14)
Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAHeader.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMembership.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAHeader.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAHeader.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAHeader.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAHeader.java Fri Jan 14 10:46:48 2011 @@ -36,25 +36,25 @@ public class JPAHeader extends AbstractC @Id @GeneratedValue - @Column(name = "HEADER_ID", nullable = true) + @Column(name = "HEADER_ID") private long id; /** The value for the lineNumber field */ - @Basic(optional=false) - @Column(name = "HEADER_LINE_NUMBER", nullable = true) + @Basic(optional = false) + @Column(name = "HEADER_LINE_NUMBER", nullable = false) private int lineNumber; /** The value for the field field */ /** Use a max of 1024 which could happen on very freaky header field names*/ - @Basic(optional=false) - @Column(name = "HEADER_FIELD", nullable = true, length = 1024) + @Basic(optional = false) + @Column(name = "HEADER_FIELD", nullable = false, length = 1024) private String field; /** The value for the value field */ /** We use 4000 as max which is mostly overkill for most emails but better waste a bit of space then loose headers**/ /** 4000 is the maximum value accepted by Oracle for VARCHAR2 **/ - @Basic(optional=false) - @Column(name = "HEADER_VALUE", nullable = true, length = 4000) + @Basic(optional = false) + @Column(name = "HEADER_VALUE", nullable = false, length = 4000) private String value; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java Fri Jan 14 10:46:48 2011 @@ -59,25 +59,25 @@ public class JPAMailbox implements Mailb /** The value for the mailboxId field */ @Id @GeneratedValue - @Column(name = "MAILBOX_ID", nullable = true) + @Column(name = "MAILBOX_ID") private long mailboxId; /** The value for the name field */ - @Basic(optional=false) - @Column(name = "MAILBOX_NAME", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "MAILBOX_NAME", nullable = false, length = 200) private String name; /** The value for the uidValidity field */ - @Basic(optional=false) - @Column(name = "MAILBOX_UID_VALIDITY", nullable = true) + @Basic(optional = false) + @Column(name = "MAILBOX_UID_VALIDITY", nullable = false) private long uidValidity; - @Basic(optional=false) - @Column(name = "USER_NAME", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "USER_NAME", nullable = false, length = 200) private String user; - @Basic(optional=false) - @Column(name = "MAILBOX_NAMESPACE", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "MAILBOX_NAMESPACE", nullable = false, length = 200) private String namespace; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAProperty.java Fri Jan 14 10:46:48 2011 @@ -39,23 +39,23 @@ public class JPAProperty extends Abstrac private long id; /** Order within the list of properties */ - @Basic(optional=false) - @Column(name = "PROPERTY_LINE_NUMBER", nullable = true) + @Basic(optional = false) + @Column(name = "PROPERTY_LINE_NUMBER", nullable = false) private int line; /** Local part of the name of this property */ - @Basic(optional=false) - @Column(name = "PROPERTY_LOCAL_NAME", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "PROPERTY_LOCAL_NAME", nullable = false, length = 500) private String localName; /** Namespace part of the name of this property */ - @Basic(optional=false) - @Column(name = "PROPERTY_NAME_SPACE", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "PROPERTY_NAME_SPACE", nullable = false, length = 500) private String namespace; /** Value of this property */ - @Basic(optional=false) - @Column(name = "PROPERTY_VALUE", nullable = true, length = 200) + @Basic(optional = false) + @Column(name = "PROPERTY_VALUE", nullable = false, length = 1024) private String value; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMembership.java Fri Jan 14 10:46:48 2011 @@ -133,44 +133,44 @@ public abstract class AbstractJPAMailbox /** The value for the uid field */ @Id - @Column(name = "MAIL_UID", nullable = true) + @Column(name = "MAIL_UID") private long uid; /** The value for the internalDate field */ @Basic(optional = false) - @Column(name = "MAIL_DATE", nullable = true) + @Column(name = "MAIL_DATE") private Date internalDate; /** The value for the answered field */ @Basic(optional = false) - @Column(name = "MAIL_IS_ANSWERED", nullable = true) + @Column(name = "MAIL_IS_ANSWERED", nullable = false) private boolean answered = false; /** The value for the deleted field */ @Basic(optional = false) - @Column(name = "MAIL_IS_DELETED", nullable = true) + @Column(name = "MAIL_IS_DELETED", nullable = false) @Index private boolean deleted = false; /** The value for the draft field */ @Basic(optional = false) - @Column(name = "MAIL_IS_DRAFT", nullable = true) + @Column(name = "MAIL_IS_DRAFT", nullable = false) private boolean draft = false; /** The value for the flagged field */ @Basic(optional = false) - @Column(name = "MAIL_IS_FLAGGED", nullable = true) + @Column(name = "MAIL_IS_FLAGGED", nullable = false) private boolean flagged = false; /** The value for the recent field */ @Basic(optional = false) - @Column(name = "MAIL_IS_RECENT", nullable = true) + @Column(name = "MAIL_IS_RECENT", nullable = false) @Index private boolean recent = false; /** The value for the seen field */ @Basic(optional = false) - @Column(name = "MAIL_IS_SEEN", nullable = true) + @Column(name = "MAIL_IS_SEEN", nullable = false) @Index private boolean seen = false; Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java Fri Jan 14 10:46:48 2011 @@ -48,31 +48,31 @@ public abstract class AbstractJPAMessage @Id @GeneratedValue - @Column(name = "MAIL_ID", nullable = true) + @Column(name = "MAIL_ID") private long id; /** The first body octet */ - @Basic(optional=false) - @Column(name = "MAIL_BODY_START_OCTET", nullable = true) + @Basic(optional = false) + @Column(name = "MAIL_BODY_START_OCTET", nullable = false) private int bodyStartOctet; /** Number of octets in the full document content */ - @Basic(optional=false) - @Column(name = "MAIL_CONTENT_OCTETS_COUNT", nullable = true) + @Basic(optional = false) + @Column(name = "MAIL_CONTENT_OCTETS_COUNT", nullable = false) private long contentOctets; /** MIME media type */ - @Basic(optional=true) + @Basic(optional = true) @Column(name = "MAIL_MIME_TYPE", nullable = true, length = 200) private String mediaType; /** MIME sub type */ - @Basic(optional=true) + @Basic(optional = true) @Column(name = "MAIL_MIME_SUBTYPE", nullable = true, length = 200) private String subType; /** THE CRFL count when this document is textual, null otherwise */ - @Basic(optional=true) + @Basic(optional = true) @Column(name = "MAIL_TEXTUAL_LINE_COUNT", nullable = true) private Long textualLineCount; Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMembership.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMembership.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMembership.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMailboxMembership.java Fri Jan 14 10:46:48 2011 @@ -43,7 +43,7 @@ public class JPAMailboxMembership extend /** The value for the body field. Lazy loaded */ @ManyToOne(cascade = CascadeType.ALL, fetch=FetchType.LAZY) - @Column(name = "MAIL_ID", nullable = true) + @Column(name = "MAIL_ID", nullable = false) private JPAMessage message; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAMessage.java Fri Jan 14 10:46:48 2011 @@ -42,7 +42,7 @@ public class JPAMessage extends Abstract /** The value for the body field. Lazy loaded */ /** We use a max length to represent 1gb data. Thats prolly overkill, but who knows */ @Basic(optional = false, fetch = FetchType.LAZY) - @Column(name = "MAIL_BYTES", length = 1048576000, nullable = true) + @Column(name = "MAIL_BYTES", length = 1048576000, nullable = false) @Lob private byte[] content; @Deprecated Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java Fri Jan 14 10:46:48 2011 @@ -44,7 +44,7 @@ public class JPAStreamingMailboxMembersh /** The value for the body field. Lazy loaded */ @ManyToOne(cascade = CascadeType.ALL, fetch=FetchType.LAZY) - @Column(name = "MAIL_ID", nullable = true) + @Column(name = "MAIL_ID", nullable = false) private JPAStreamingMessage message; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/JPAStreamingMessage.java Fri Jan 14 10:46:48 2011 @@ -51,7 +51,7 @@ import org.apache.openjpa.persistence.Pe public class JPAStreamingMessage extends AbstractJPAMessage { @Persistent(optional=false, fetch=FetchType.LAZY) - @Column(name = "MAIL_BYTES", length=1048576000, nullable = true) + @Column(name = "MAIL_BYTES", length=1048576000, nullable = false) private InputStream content; @Deprecated Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java?rev=1058935&r1=1058934&r2=1058935&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/user/model/JPASubscription.java Fri Jan 14 10:46:48 2011 @@ -36,7 +36,11 @@ import org.apache.james.mailbox.store.us @Entity(name = "Subscription") @Table( name = "JAMES_SUBSCRIPTION", - uniqueConstraints = @UniqueConstraint(columnNames={"USER_NAME", "MAILBOX_NAME"}) + uniqueConstraints = + @UniqueConstraint( + columnNames={ + "USER_NAME", + "MAILBOX_NAME"}) ) @NamedQueries({ @NamedQuery(name = "findFindMailboxSubscriptionForUser", @@ -51,16 +55,16 @@ public class JPASubscription implements /** Primary key */ @GeneratedValue @Id - @Column(name = "SUBSCRIPTION_ID", nullable = false) + @Column(name = "SUBSCRIPTION_ID") private long id; /** Name of the subscribed user */ - @Basic(optional=false) + @Basic(optional = false) @Column(name = "USER_NAME", nullable = false, length = 100) private String username; /** Subscribed mailbox */ - @Basic(optional=false) + @Basic(optional = false) @Column(name = "MAILBOX_NAME", nullable = false, length = 100) private String mailbox; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org