Merge branch 'release/2022-10-rc1'

Author: ivan-gomes

app/controllers/BranchController.java

@@ -57,10 +57,10 @@ public BranchController(BranchService branchService, MetamodelProvider metamodel
     public Result postBranchByProject(UUID projectId, Request request) {
         JsonNode requestBodyJson = request.body().asJson();
         Branch requestedObject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(Branch.class));
-        if (requestedObject.getId() != null || requestedObject.getTimestamp() != null) {
+        if (requestedObject.getId() != null || requestedObject.getCreated() != null) {
             return Results.badRequest();
         }
-        requestedObject.setTimestamp(ZonedDateTime.now());
+        requestedObject.setCreated(ZonedDateTime.now());
         Optional<Branch> branch = branchService.create(projectId, requestedObject);
         if (branch.isEmpty()) {
             return Results.internalServerError();

app/controllers/CommitController.java

@@ -65,10 +65,10 @@ public Result postCommitByProjectNameResolved(UUID projectId, @SuppressWarnings(
     private Result postCommitByProject(UUID projectId, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<UUID> branchId, Request request, CommitCreator creator) {
         JsonNode requestBodyJson = request.body().asJson();
         Commit requestedObject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(Commit.class));
-        if (requestedObject.getId() != null || requestedObject.getTimestamp() != null) {
+        if (requestedObject.getId() != null || requestedObject.getCreated() != null) {
             return Results.badRequest();
         }
-        requestedObject.setTimestamp(ZonedDateTime.now());
+        requestedObject.setCreated(ZonedDateTime.now());
         Optional<Commit> commit = creator.create(projectId, branchId.orElse(null), requestedObject);
         if (commit.isEmpty()) {
             return Results.internalServerError();

app/controllers/TagController.java

@@ -55,10 +55,10 @@ public TagController(TagService tagService, MetamodelProvider metamodelProvider,
     public Result postTagByProject(UUID projectId, Request request) {
         JsonNode requestBodyJson = request.body().asJson();
         Tag requestedObject = Json.fromJson(requestBodyJson, metamodelProvider.getImplementationClass(Tag.class));
-        if (requestedObject.getId() != null || requestedObject.getTimestamp() != null) {
+        if (requestedObject.getId() != null || requestedObject.getCreated() != null) {
             return Results.badRequest();
         }
-        requestedObject.setTimestamp(ZonedDateTime.now());
+        requestedObject.setCreated(ZonedDateTime.now());
         Optional<Tag> tag = tagService.create(projectId, requestedObject);
         if (tag.isEmpty()) {
             return Results.internalServerError();

app/dao/impl/FlatSchemaDao.java

@@ -22,10 +22,13 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Streams;
 import config.MetamodelProvider;
 import dao.SchemaDao;
 import jackson.databind.ObjectMapperFactory;
+import org.omg.sysml.data.ExternalData;
+import org.omg.sysml.data.ExternalRelationship;
+import org.omg.sysml.data.ProjectUsage;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -47,10 +50,15 @@ public class FlatSchemaDao implements SchemaDao {
     public FlatSchemaDao(MetamodelProvider metamodelProvider, ObjectMapperFactory mapperFactory) {
         this.mapper = mapperFactory.getObjectMapper();
         try (Stream<Class<?>> interfaces = metamodelProvider.getAllInterfaces().stream()) {
-            map = interfaces
-                    .map(type -> FlatSchemaDao.class.getResourceAsStream(String.format("/json/schema/sysml/%s.json",
-                            type.getSimpleName())))
-                    .filter(Objects::nonNull)
+            map = Streams.concat(
+                            interfaces
+                                    .map(type -> FlatSchemaDao.class.getResourceAsStream(String.format("/json/schema/lang/%s.json",
+                                            type.getSimpleName())))
+                                    .filter(Objects::nonNull),
+                            Stream.of(ExternalData.class, ExternalRelationship.class, ProjectUsage.class)
+                                    .map(type -> FlatSchemaDao.class.getResourceAsStream(String.format("/json/schema/api/%s.json",
+                                            type.getSimpleName())))
+                    )
                     .map(input -> {
                         try {
                             return mapper.reader().readTree(input);

app/dao/impl/jpa/JpaDataDao.java

@@ -35,7 +35,6 @@
 import org.omg.sysml.internal.impl.WorkingDataVersionImpl;
 import org.omg.sysml.lifecycle.Commit;
 import org.omg.sysml.lifecycle.Data;
-import org.omg.sysml.lifecycle.DataIdentity;
 import org.omg.sysml.lifecycle.DataVersion;
 import org.omg.sysml.lifecycle.impl.CommitImpl;
 import org.omg.sysml.query.*;
@@ -96,7 +95,7 @@ public List<Data> findByCommitAndQuery(Commit commit, Query query) {
             Commit c = em.contains(commit) ? commit : em.find(CommitImpl.class, commit.getId());
             Query q = query.getId() == null || em.contains(query) ? query : em.find(QueryImpl.class, query.getId());
             return getCommitIndex(c, em).getWorkingDataVersion().stream()
-                    .filter(scope(q))
+//                    .filter(scope(q))
                     .map(WorkingDataVersion::getDataVersion)
                     .map(DataVersion::getPayload)
                     .filter(constrain(q.getWhere()))
@@ -155,7 +154,7 @@ protected Stream<WorkingDataVersion> streamWorkingDataVersions(Commit commit, En
 
         Set<WorkingDataVersion> _usedDataVersions = ConcurrentHashMap.newKeySet();
         for (ProjectUsage projectUsage : projectUsages) {
-            Commit usedCommit = projectUsage.getUsedProjectCommit();
+            Commit usedCommit = projectUsage.getUsedCommit();
             if (usedCommit == null) {
                 continue;
             }
@@ -263,7 +262,7 @@ else if (constraint instanceof CompositeConstraint) {
             throw new IllegalArgumentException("Unknown constraint type: " + constraint.getClass().getSimpleName());
         }
     }
-
+/*
     protected Predicate<WorkingDataVersion> scope(Query query) {
         if (query.getScope() == null || query.getScope().isEmpty()) {
             return ev -> true;
@@ -272,4 +271,5 @@ protected Predicate<WorkingDataVersion> scope(Query query) {
                 .map(DataIdentity::getId)
                 .anyMatch(id -> Objects.equals(id, working.getDataVersion().getIdentity().getId()));
     }
+*/
 }

app/dao/impl/jpa/JpaProjectDao.java

@@ -34,7 +34,6 @@
 import javax.inject.Singleton;
 import java.time.ZonedDateTime;
 import java.util.Optional;
-import java.util.UUID;
 
 @Singleton
 public class JpaProjectDao extends SimpleJpaDao<Project, ProjectImpl> implements ProjectDao {
@@ -61,7 +60,7 @@ public Optional<Project> persist(Project project) {
         defaultBranch.setOwningProject(project);
         defaultBranch.setName(Project.DEFAULT_BRANCH_NAME);
         // TODO Add timestamp to Project and inherit into defaultBranch
-        defaultBranch.setTimestamp(ZonedDateTime.now());
+        defaultBranch.setCreated(ZonedDateTime.now());
         project.setDefaultBranch(defaultBranch);
         return super.persist(project);
     }

app/dao/impl/jpa/JpaQueryDao.java

@@ -49,12 +49,14 @@ public JpaQueryDao(JPAManager jpaManager) {
     @Override
     public Optional<Query> persist(Query query) {
         return jpaManager.transact(em -> {
+/*
             query.setScope(
                     query.getScope().stream()
                             .filter(identity -> Objects.nonNull(identity.getId()))
                             .map(em::merge)
                             .collect(Collectors.toSet())
             );
+*/
             return super.persist(query, em);
         });
     }

app/org/omg/sysml/data/ExternalRelationship.java

@@ -27,11 +27,11 @@
 
 public interface ExternalRelationship extends Data {
 
-    String getSpecification();
-
-    String getLanguage();
-
     Element getElementEnd();
 
     ExternalData getExternalDataEnd();
+
+    String getLanguage();
+
+    String getSpecification();
 }

app/org/omg/sysml/data/ProjectUsage.java

@@ -26,7 +26,7 @@
 
 public interface ProjectUsage extends Data {
 
-    Commit getUsedProjectCommit();
+    Commit getUsedCommit();
 
     Project getUsedProject();
 }

app/org/omg/sysml/data/impl/ExternalRelationshipImpl.java

@@ -64,28 +64,6 @@ public void setId(UUID id) {
         this.id = id;
     }
 
-    private String specification;
-
-    @JsonGetter
-    @Column(name = "specification", table = "ExternalRelationship")
-    public String getSpecification() { return specification; }
-
-    @JsonSetter
-    public void setSpecification(String specification) {
-        this.specification = specification;
-    }
-
-    private String language;
-
-    @JsonGetter
-    @Column(name = "language", table = "ExternalRelationship")
-    public String getLanguage() { return language; }
-
-    @JsonSetter
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
     private Element elementEnd;
 
     @JsonGetter
@@ -117,4 +95,26 @@ public ExternalData getExternalDataEnd() {
     public void setExternalDataEnd(ExternalData externalDataEnd) {
         this.externalDataEnd = externalDataEnd;
     }
+
+    private String language;
+
+    @JsonGetter
+    @Column(name = "language", table = "ExternalRelationship")
+    public String getLanguage() { return language; }
+
+    @JsonSetter
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    private String specification;
+
+    @JsonGetter
+    @Column(name = "specification", table = "ExternalRelationship")
+    public String getSpecification() { return specification; }
+
+    @JsonSetter
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
 }