Add nullability constraints everywhere.
Change-Id: I80577b7784006070f29ce11af4e6fd87c10363bf
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
index f72d36e..5b45216 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleBranchTip.java
@@ -1,6 +1,7 @@
package eu.mulk.mulkcms2.cms.pages;
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+import javax.annotation.CheckForNull;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -14,11 +15,12 @@
@Immutable
public class ArticleBranchTip extends PanacheEntityBase {
- @Column(name = "article", nullable = true)
+ @Column(name = "article", nullable = false)
@Id
- private Integer articleId;
+ private int articleId;
@Column(name = "revision", nullable = true)
@Id
+ @CheckForNull
private Integer revisionId;
}
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
index 2c9af5f..f7993f1 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleCommentCount.java
@@ -12,10 +12,10 @@
@Immutable
public class ArticleCommentCount extends PanacheEntityBase {
- @Column(name = "article", nullable = true)
+ @Column(name = "article", nullable = false)
@Id
- public Integer article;
+ public int articleId;
- @Column(name = "comment_count", nullable = true)
- public Long commentCount;
+ @Column(name = "comment_count", nullable = false)
+ public long commentCount;
}
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
index 532c148..1fe92f3 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticlePublishingDate.java
@@ -2,6 +2,7 @@
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import java.sql.Timestamp;
+import javax.annotation.CheckForNull;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -13,10 +14,11 @@
@Immutable
public class ArticlePublishingDate extends PanacheEntityBase {
- @Column(name = "article", nullable = true)
+ @Column(name = "article", nullable = false)
@Id
- public Integer article;
+ public int article;
@Column(name = "publishing_date", nullable = true)
+ @CheckForNull
public Timestamp publishingDate;
}
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
index 2034e35..cf45142 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevision.java
@@ -5,6 +5,7 @@
import java.sql.Timestamp;
import java.util.Collection;
import java.util.Set;
+import javax.annotation.CheckForNull;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -28,6 +29,7 @@
public Integer id;
@Column(name = "date", nullable = true)
+ @CheckForNull
public Timestamp date;
@Column(name = "title", nullable = false, length = -1)
@@ -43,6 +45,7 @@
public String status;
@Column(name = "global_id", nullable = true, length = -1)
+ @CheckForNull
public String globalId;
@OneToMany(mappedBy = "articleRevision", fetch = FetchType.LAZY)
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
index d5ca828..0ac7ae5 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleRevisionCharacteristic.java
@@ -1,6 +1,7 @@
package eu.mulk.mulkcms2.cms.pages;
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+import javax.annotation.CheckForNull;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -33,5 +34,6 @@
public ArticleRevision articleRevision;
@Column(name = "value", nullable = true, length = -1)
+ @CheckForNull
public String value;
}
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
index c59acaa..c2c50bb 100644
--- a/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/ArticleType.java
@@ -2,6 +2,7 @@
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import java.util.Collection;
+import javax.annotation.CheckForNull;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -21,9 +22,11 @@
public Integer id;
@Column(name = "name", nullable = true, length = -1)
+ @CheckForNull
public String name;
@Column(name = "page_template", nullable = true, length = -1)
+ @CheckForNull
public String pageTemplate;
@OneToMany(mappedBy = "type", fetch = FetchType.LAZY)
diff --git a/src/main/java/eu/mulk/mulkcms2/cms/pages/package-info.java b/src/main/java/eu/mulk/mulkcms2/cms/pages/package-info.java
new file mode 100644
index 0000000..2cbe2ac
--- /dev/null
+++ b/src/main/java/eu/mulk/mulkcms2/cms/pages/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package eu.mulk.mulkcms2.cms.pages;
+
+import pl.tlinkowski.annotation.basic.NonNullPackage;