#16 do not enforce not using the nullable flag when there is an @Elem…

…entCollection annotation (#18)
cloudflightio · Sep 21, 2022 · 8c7f3cf · 8c7f3cf
1 parent 5fb6a12
commit 8c7f3cf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/main/kotlin/io/cloudflight/cleancode/archunit/rules/jpa/JpaRuleSet.kt b/src/main/kotlin/io/cloudflight/cleancode/archunit/rules/jpa/JpaRuleSet.kt
@@ -10,6 +10,7 @@ import com.tngtech.archunit.lang.syntax.ArchRuleDefinition.fields
 import io.cloudflight.cleancode.archunit.ArchRuleWithId.Companion.archRuleWithId
 import io.cloudflight.cleancode.archunit.utils.AreKotlinClasses
 import javax.persistence.Column
+import javax.persistence.ElementCollection
 import kotlin.reflect.KProperty1
 
 class JpaRuleSet {
@@ -18,7 +19,9 @@ class JpaRuleSet {
     val do_not_use_column_nullable =
         archRuleWithId(
             "jpa.entities-not-null-instead-of-nullable",
-            fields().should(NotUseTheAnnotationField(Column::nullable))
+            fields().that()
+                .areNotAnnotatedWith(ElementCollection::class.java)
+                .should(NotUseTheAnnotationField(Column::nullable))
         )
 
     @ArchTest

diff --git a/src/test/kotlin/io/cloudflight/cleancode/archunit/rules/jpa/JpaRuleSetTest.kt b/src/test/kotlin/io/cloudflight/cleancode/archunit/rules/jpa/JpaRuleSetTest.kt
@@ -4,10 +4,7 @@ import com.tngtech.archunit.core.importer.ClassFileImporter
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import java.time.OffsetDateTime
-import javax.persistence.Column
-import javax.persistence.Entity
-import javax.persistence.Id
-import javax.persistence.ManyToOne
+import javax.persistence.*
 import javax.validation.constraints.NotNull
 import javax.validation.constraints.Size
 
@@ -72,6 +69,12 @@ class JpaRuleSetTest {
             rules.nullable_flag_of_kotlin_needs_to_match_jpa_specification.check(importer)
         }
     }
+
+    @Test
+    fun `nullable column with element collection`() {
+        val importer = ClassFileImporter().importClasses(EntityWithFiles::class.java)
+        rules.do_not_use_column_nullable.check(importer)
+    }
 }
 
 @Entity
@@ -148,4 +151,19 @@ class EntityWithJoinToOtherOptionalErronousEntity(
     val id: Long = 0,
     @ManyToOne(optional = false)
     var someEntity: EntityWithColumnLength?
-)
+)
+
+
+class EntityWithFiles {
+    @ElementCollection
+    @CollectionTable(
+        name = "some_entity_file",
+        joinColumns = [JoinColumn(name = "some_entity_id")],
+        uniqueConstraints = [UniqueConstraint(name = "unique_some_entity_file_id", columnNames = ["file_id"])]
+    )
+    @Column(name = "file_id", nullable = false)
+    var someFiles = mutableSetOf<FileReference>()
+}
+
+@Entity
+class FileReference