Fixed an issue with parameter ordering that caused IDs in TemporalMet…

…adataDescriptor to be swapped. Signed-off-by: Ralph Gasser <[email protected]>
vitrivr · Dec 22, 2023 · 2f182f3 · 2f182f3
1 parent 5991e5c
commit 2f182f3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/StructDescriptor.kt b/...-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/StructDescriptor.kt
@@ -8,6 +8,4 @@ import org.vitrivr.engine.core.model.descriptor.Descriptor
  * @author Ralph Gasser
  * @version 1.0.0
  */
-interface StructDescriptor: Descriptor {
-
-}
+interface StructDescriptor : Descriptor
diff --git a/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt b/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt
@@ -13,8 +13,8 @@ import org.vitrivr.engine.core.model.retrievable.RetrievableId
  * @version 1.0.0
  */
 data class TemporalMetadataDescriptor(
-    override val retrievableId: RetrievableId, //retrievable Id must come first, due to reflection
     override val id: DescriptorId,
+    override val retrievableId: RetrievableId, //retrievable Id must come first, due to reflection
     val startNs: Long,
     val endNs: Long,
     override val transient: Boolean = false

diff --git a/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt b/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt
@@ -13,8 +13,8 @@ import org.vitrivr.engine.core.model.retrievable.RetrievableId
  * @version 1.0.0
  */
 data class FileSourceMetadataDescriptor(
-    override val retrievableId: RetrievableId,
     override val id: DescriptorId,
+    override val retrievableId: RetrievableId,
     val path: String,
     val size: Long,
     override val transient: Boolean = false

diff --git a/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt b/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt
@@ -14,8 +14,8 @@ import java.util.*
  * @version 1.0.0
  */
 class VideoSourceMetadataDescriptor(
-    override val retrievableId: RetrievableId,
     override val id: DescriptorId,
+    override val retrievableId: RetrievableId,
     val width: Int,
     val height: Int,
     val fps: Double,