Systems-Modeling · ivan-gomes · Feb 23, 2025 · Jan 21, 2025
diff --git a/app/org/omg/sysml/internal/CommitDataVersionIndex.java b/app/org/omg/sysml/internal/CommitDataVersionIndex.java
@@ -23,14 +23,15 @@
 package org.omg.sysml.internal;
 
 import org.omg.sysml.lifecycle.Commit;
-import org.omg.sysml.lifecycle.DataVersion;
-import org.omg.sysml.record.Record;
-import org.omg.sysml.record.impl.RecordImpl;
 
 import java.util.Set;
 import java.util.UUID;
 
-public interface CommitDataVersionIndex extends Record {
+public interface CommitDataVersionIndex {
+
+    UUID getId();
+
+    void setId(UUID id);
 
     Commit getCommit();
 

diff --git a/app/org/omg/sysml/internal/CommitNamedElementIndex.java b/app/org/omg/sysml/internal/CommitNamedElementIndex.java
@@ -2,12 +2,15 @@
 
 import org.omg.sysml.lifecycle.Commit;
 import org.omg.sysml.metamodel.Element;
-import org.omg.sysml.record.Record;
 
 import java.util.Map;
 import java.util.UUID;
 
-public interface CommitNamedElementIndex extends Record {
+public interface CommitNamedElementIndex {
+
+    UUID getId();
+
+    void setId(UUID id);
 
     Commit getCommit();
 

diff --git a/app/org/omg/sysml/lifecycle/CommitReference.java b/app/org/omg/sysml/lifecycle/CommitReference.java
@@ -22,13 +22,17 @@
 
 import org.omg.sysml.record.Record;
 
+import javax.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 
 public interface CommitReference extends Record {
 
+    @Override
+    @NotNull
     String getName();
 
-    void setName(String name);
+    @Override
+    void setName(@NotNull String name);
 
     Project getOwningProject();
 

diff --git a/app/org/omg/sysml/lifecycle/Project.java b/app/org/omg/sysml/lifecycle/Project.java
@@ -24,6 +24,7 @@
 
 import org.omg.sysml.record.Record;
 
+import javax.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 
 public interface Project extends Record {
@@ -43,7 +44,10 @@ public interface Project extends Record {
 
     void setDefaultBranch(Branch defaultBranch);
 
+    @Override
+    @NotNull
     String getName();
 
-    void setName(String name);
+    @Override
+    void setName(@NotNull String name);
 }
diff --git a/app/org/omg/sysml/lifecycle/impl/BranchImpl.java b/app/org/omg/sysml/lifecycle/impl/BranchImpl.java
@@ -22,9 +22,7 @@
 
 package org.omg.sysml.lifecycle.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import jackson.RecordSerialization;
@@ -34,15 +32,27 @@
 import org.omg.sysml.record.impl.RecordImpl;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 
 @Entity(name = "Branch")
 public class BranchImpl extends RecordImpl implements Branch {
     private Project owningProject;
     private Commit head;
-    private String name;
     private ZonedDateTime created;
 
+    @Override
+    @JsonProperty(required = true)
+    public @NotNull String getName() {
+        return super.getName();
+    }
+
+    @Override
+    @JsonProperty(required = true)
+    public void setName(@NotNull String name) {
+        super.setName(name);
+    }
+
     @Override
     @ManyToOne(targetEntity = ProjectImpl.class, fetch = FetchType.LAZY)
     @JsonSerialize(as = ProjectImpl.class, using = RecordSerialization.RecordSerializer.class)
@@ -74,21 +84,6 @@ public Commit getReferencedCommit() {
         return Branch.super.getReferencedCommit();
     }
 
-    @JsonProperty(required = true)
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @javax.persistence.Column(name = "name", table = "Branch")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty(required = true)
-    @JsonSetter
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     @Column
     public ZonedDateTime getCreated() {

diff --git a/app/org/omg/sysml/lifecycle/impl/ProjectImpl.java b/app/org/omg/sysml/lifecycle/impl/ProjectImpl.java
@@ -33,6 +33,7 @@
 import org.omg.sysml.record.impl.RecordImpl;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 
 @Entity(name = "Project")
@@ -50,21 +51,16 @@ public void setCreated(ZonedDateTime created) {
         this.created = created;
     }
 
-    private String name;
-
+    @Override
     @JsonProperty(required = true)
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @javax.persistence.Column(name = "name", table = "Project")
-    public String getName() {
-        return name;
+    public @NotNull String getName() {
+        return super.getName();
     }
 
+    @Override
     @JsonProperty(required = true)
-    @JsonSetter
-    public void setName(String name) {
-        this.name = name;
+    public void setName(@NotNull String name) {
+        super.setName(name);
     }
 
     private Branch defaultBranch;

diff --git a/app/org/omg/sysml/lifecycle/impl/TagImpl.java b/app/org/omg/sysml/lifecycle/impl/TagImpl.java
@@ -20,9 +20,7 @@
 
 package org.omg.sysml.lifecycle.impl;
 
-import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import jackson.RecordSerialization;
@@ -32,15 +30,27 @@
 import org.omg.sysml.record.impl.RecordImpl;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.time.ZonedDateTime;
 
 @Entity(name = "Tag")
 public class TagImpl extends RecordImpl implements Tag {
     private Project owningProject;
     private Commit taggedCommit;
-    private String name;
     private ZonedDateTime created;
 
+    @Override
+    @JsonProperty(required = true)
+    public @NotNull String getName() {
+        return super.getName();
+    }
+
+    @Override
+    @JsonProperty(required = true)
+    public void setName(@NotNull String name) {
+        super.setName(name);
+    }
+
     @Override
     @ManyToOne(targetEntity = ProjectImpl.class, fetch = FetchType.LAZY)
     @JsonSerialize(as = ProjectImpl.class, using = RecordSerialization.RecordSerializer.class)
@@ -71,21 +81,6 @@ public Commit getReferencedCommit() {
         return Tag.super.getReferencedCommit();
     }
 
-    @JsonProperty(required = true)
-    @JsonGetter
-    @Lob
-    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
-    @Column(name = "name", table = "Tag")
-    public String getName() {
-        return name;
-    }
-
-    @JsonProperty(required = true)
-    @JsonSetter
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     @Column
     public ZonedDateTime getCreated() {

diff --git a/app/org/omg/sysml/query/Query.java b/app/org/omg/sysml/query/Query.java
@@ -25,9 +25,18 @@
 import org.omg.sysml.lifecycle.Project;
 import org.omg.sysml.record.Record;
 
+import javax.validation.constraints.NotNull;
 import java.util.Set;
 
 public interface Query extends Record {
+
+    @Override
+    @NotNull
+    String getName();
+
+    @Override
+    void setName(@NotNull String name);
+
     Project getOwningProject();
 
     void setOwningProject(Project owningProject);

diff --git a/app/org/omg/sysml/query/impl/QueryImpl.java b/app/org/omg/sysml/query/impl/QueryImpl.java
@@ -29,30 +29,40 @@
 import jackson.RecordSerialization;
 import org.hibernate.annotations.Any;
 import org.hibernate.annotations.Cascade;
-import org.omg.sysml.lifecycle.DataIdentity;
 import org.omg.sysml.lifecycle.Project;
-import org.omg.sysml.lifecycle.impl.DataIdentityImpl;
 import org.omg.sysml.lifecycle.impl.ProjectImpl;
 import org.omg.sysml.query.Constraint;
 import org.omg.sysml.query.Query;
 import org.omg.sysml.record.impl.RecordImpl;
 
 import javax.persistence.*;
-import java.util.ArrayList;
+import javax.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
 
 @Entity(name = "Query")
 public class QueryImpl extends RecordImpl implements Query {
     private Project owningProject;
     private Set<String> select;
-/*
+    /*
     private Set<DataIdentity> scope;
     private Boolean recursiveInScope;
     private List<String> orderBy;
-*/
+    */
     private Constraint where;
 
+    @Override
+    @JsonProperty(required = true)
+    public @NotNull String getName() {
+        return super.getName();
+    }
+
+    @Override
+    @JsonProperty(required = true)
+    public void setName(@NotNull String name) {
+        super.setName(name);
+    }
+
     @Override
     @ManyToOne(targetEntity = ProjectImpl.class, fetch = FetchType.LAZY)
     @JsonSerialize(as = ProjectImpl.class, using = RecordSerialization.RecordSerializer.class)

diff --git a/app/org/omg/sysml/record/Record.java b/app/org/omg/sysml/record/Record.java
@@ -22,10 +22,21 @@
 
 package org.omg.sysml.record;
 
+import javax.annotation.Nullable;
+import java.util.Set;
 import java.util.UUID;
 
 public interface Record {
     UUID getId();
 
     void setId(UUID id);
+
+    @Nullable
+    String getName();
+
+    void setName(@Nullable String name);
+
+    Set<String> getAlias();
+
+    void setAlias(Set<String> alias);
 }
diff --git a/app/org/omg/sysml/record/impl/RecordImpl.java b/app/org/omg/sysml/record/impl/RecordImpl.java
@@ -26,17 +26,19 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import org.omg.sysml.record.Record;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import javax.annotation.Nullable;
+import javax.persistence.*;
+import java.util.LinkedHashSet;
+import java.util.Set;
 import java.util.UUID;
 
 import static jackson.RecordSerialization.IDENTITY_FIELD;
 
 @MappedSuperclass
 public abstract class RecordImpl implements Record {
     private UUID id;
+    private String name;
+    private Set<String> alias = new LinkedHashSet<>();
 
     @Override
     @Id
@@ -51,4 +53,41 @@ public UUID getId() {
     public void setId(UUID id) {
         this.id = id;
     }
+
+    @Override
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @Column(name = "name")
+    public @Nullable String getName() {
+        return name;
+    }
+
+    @Override
+    @JsonSetter
+    public void setName(@Nullable String name) {
+        this.name = name;
+        if (name != null) {
+            this.alias.add(name);
+        }
+    }
+
+    @Override
+    @JsonGetter
+    @Lob
+    @org.hibernate.annotations.Type(type = "org.hibernate.type.TextType")
+    @ElementCollection(targetClass = String.class)
+    @CollectionTable
+    public Set<String> getAlias() {
+        return alias;
+    }
+
+    @Override
+    @JsonSetter
+    public void setAlias(Set<String> alias) {
+        this.alias = alias;
+        if (name != null) {
+            this.alias.add(name);
+        }
+    }
 }