Merge branch 'release/2022-04-m1'

Author: ivan-gomes

app/controllers/ElementController.java

@@ -75,7 +75,7 @@ private Result buildPaginatedResult(List<Element> elements, UUID projectId, UUID
         return paginateResult(
                 buildResult(elements, List.class, metamodelProvider.getImplementationClass(Element.class), request, new DataJsonLdAdorner.Parameters(projectId, commitId)),
                 elements.size(),
-                idx -> elements.get(idx).getIdentifier(),
+                idx -> elements.get(idx).getElementId(),
                 request,
                 pageRequest
         );

app/controllers/RelationshipController.java

@@ -75,7 +75,7 @@ private Result buildPaginatedResult(List<Relationship> relationships, UUID proje
         return paginateResult(
                 buildResult(relationships, List.class, metamodelProvider.getImplementationClass(Relationship.class), request, new DataJsonLdAdorner.Parameters(projectId, commitId)),
                 relationships.size(),
-                idx -> relationships.get(idx).getIdentifier(),
+                idx -> relationships.get(idx).getElementId(),
                 request,
                 pageRequest
         );

app/dao/impl/jpa/JpaCommitDao.java

@@ -192,7 +192,11 @@ public void setId(UUID id) {
             return cacheResolver.apply(data, identifierToDataMap)
                     .map(fnData -> fnData != tombstone ? fnData : null)
                     .orElseGet(() -> {
-                        Data resolved = commitResolver.apply(data, commit.getPreviousCommit());
+                        Commit previousCommit = commit.getPreviousCommit();
+                        if (previousCommit == null) {
+                            return null;
+                        }
+                        Data resolved = commitResolver.apply(data, previousCommit);
                         identifierToDataMap.put(resolved.getId(), resolved);
                         return resolved;
                     });

app/dao/impl/jpa/JpaElementDao.java

@@ -74,7 +74,7 @@ public Optional<Element> findById(UUID id) {
             CriteriaQuery<ElementImpl> query = builder.createQuery(ElementImpl.class);
             Root<ElementImpl> root = query.from(ElementImpl.class);
             query.select(root).where(builder.and(
-                    builder.equal(root.get(ElementImpl_.identifier), id),
+                    builder.equal(root.get(ElementImpl_.elementId), id),
                     getTypeExpression(builder, root)
             ));
             try {
@@ -106,7 +106,7 @@ public List<Element> findAll(@Nullable UUID after, @Nullable UUID before, int ma
             Root<ElementImpl> root = query.from(ElementImpl.class);
             query.select(root);
             Expression<Boolean> where = getTypeExpression(builder, root);
-            Paginated<TypedQuery<ElementImpl>> paginated = paginateQuery(after, before, maxResults, query, builder, em, root.get(ElementImpl_.identifier), where);
+            Paginated<TypedQuery<ElementImpl>> paginated = paginateQuery(after, before, maxResults, query, builder, em, root.get(ElementImpl_.elementId), where);
             List<Element> result = paginated.get()
                     .getResultStream()
                     .map(o -> (Element) o)
@@ -198,7 +198,7 @@ public List<Element> findRootsByCommit(Commit commit, @Nullable UUID after, @Nul
                     .filter(data -> (data instanceof Element) && !(data instanceof Relationship))
                     .map(data -> (Element) data)
                     .filter(element -> element.getOwner() == null);
-            Paginated<Stream<Element>> paginatedStream = paginateStream(after, before, maxResults, stream, Element::getIdentifier);
+            Paginated<Stream<Element>> paginatedStream = paginateStream(after, before, maxResults, stream, Element::getElementId);
             List<Element> result = paginatedStream.get()
                     .map(element -> JpaDataDao.resolve(element, Element.class))
                     .collect(Collectors.toList());

app/dao/impl/jpa/JpaRelationshipDao.java

@@ -68,7 +68,7 @@ public Optional<Relationship> findById(UUID id) {
             CriteriaQuery<RelationshipImpl> query = builder.createQuery(RelationshipImpl.class);
             Root<RelationshipImpl> root = query.from(RelationshipImpl.class);
             query.select(root).where(builder.and(
-                    builder.equal(root.get(RelationshipImpl_.identifier), id),
+                    builder.equal(root.get(RelationshipImpl_.elementId), id),
                     getTypeExpression(builder, root)
             ));
             try {
@@ -98,7 +98,7 @@ public List<Relationship> findAll(@Nullable UUID after, @Nullable UUID before, i
             Root<RelationshipImpl> root = query.from(RelationshipImpl.class);
             query.select(root);
             Expression<Boolean> where = getTypeExpression(builder, root);
-            Paginated<TypedQuery<RelationshipImpl>> paginated = paginateQuery(after, before, maxResults, query, builder, em, root.get(RelationshipImpl_.identifier), where);
+            Paginated<TypedQuery<RelationshipImpl>> paginated = paginateQuery(after, before, maxResults, query, builder, em, root.get(RelationshipImpl_.elementId), where);
             List<Relationship> result = paginated.get()
                     .getResultStream()
                     .map(o -> (Relationship) o)
@@ -146,11 +146,11 @@ public List<Relationship> findAllByCommitRelatedElement(Commit commit, Element r
                                         throw new IllegalArgumentException("Unknown RelationshipDirection provided: " + direction.name());
                                 }
                                 return related
-                                        .map(Element::getIdentifier)
-                                        .anyMatch(id -> id.equals(relatedElement.getIdentifier()));
+                                        .map(Element::getElementId)
+                                        .anyMatch(id -> id.equals(relatedElement.getElementId()));
                             }
                     );
-            Paginated<Stream<Relationship>> paginatedStream = paginateStream(after, before, maxResults, stream, Relationship::getIdentifier);
+            Paginated<Stream<Relationship>> paginatedStream = paginateStream(after, before, maxResults, stream, Relationship::getElementId);
             List<Relationship> result = paginatedStream.get()
                     .map(relationship -> JpaDataDao.resolve(relationship, Relationship.class))
                     .collect(Collectors.toList());

app/org/omg/sysml/lifecycle/impl/package-info.java

@@ -131,6 +131,7 @@
                         @MetaValue(value = "OccurrenceDefinition", targetEntity = OccurrenceDefinitionImpl.class),
                         @MetaValue(value = "OccurrenceUsage", targetEntity = OccurrenceUsageImpl.class),
                         @MetaValue(value = "OperatorExpression", targetEntity = OperatorExpressionImpl.class),
+                        @MetaValue(value = "OwningMembership", targetEntity = OwningMembershipImpl.class),
                         @MetaValue(value = "Package", targetEntity = PackageImpl.class),
                         @MetaValue(value = "ParameterMembership", targetEntity = ParameterMembershipImpl.class),
                         @MetaValue(value = "PartDefinition", targetEntity = PartDefinitionImpl.class),

app/org/omg/sysml/metamodel/AcceptActionUsage.java

@@ -1,7 +1,8 @@
 /*
  * SysML v2 REST/HTTP Pilot Implementation
- * Copyright (C) 2020  InterCAX LLC
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

app/org/omg/sysml/metamodel/ActionDefinition.java

@@ -1,7 +1,8 @@
 /*
  * SysML v2 REST/HTTP Pilot Implementation
- * Copyright (C) 2020  InterCAX LLC
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

app/org/omg/sysml/metamodel/ActionUsage.java

@@ -1,7 +1,8 @@
 /*
  * SysML v2 REST/HTTP Pilot Implementation
- * Copyright (C) 2020  InterCAX LLC
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

app/org/omg/sysml/metamodel/ActorMembership.java

@@ -1,7 +1,8 @@
 /*
  * SysML v2 REST/HTTP Pilot Implementation
- * Copyright (C) 2020  InterCAX LLC
- * Copyright (C) 2020  California Institute of Technology ("Caltech")
+ * Copyright (C) 2020 InterCAX LLC
+ * Copyright (C) 2020 California Institute of Technology ("Caltech")
+ * Copyright (C) 2021-2022 Twingineer LLC
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by