Merge pull request #249 from Open-MBEE/release/4.0.18

Release/4.0.18

Author: dlamoris

cameo/src/main/java/org/openmbee/mms/cameo/CameoConstants.java

@@ -76,7 +76,8 @@ public class CameoConstants {
     public static final String USECASEIDS = "useCaseIds";
     public static final String VALUEID = "valueId";
     public static final String VISIBILITY = "visibility";
-    public static final String APPLIEDSTEREOTYPEIDS = "_appliedStereotypeIds";
+    public static final String APPLIEDSTEREOTYPEIDS = "appliedStereotypeIds";
+    public static final String OLDAPPLIEDSTEREOTYPEIDS = "_appliedStereotypeIds";
     public static final String CHILDVIEWS = "_childViews";
     public static final String CONTENTS = "_contents";
     public static final String ISGROUP = "_isGroup";

cameo/src/main/java/org/openmbee/mms/cameo/services/CameoHelper.java

@@ -49,6 +49,9 @@ public CameoNodeType getNodeType(ElementJson e) {
 
     public boolean isView(ElementJson e) {
         List<String> sids = (List)e.get(CameoConstants.APPLIEDSTEREOTYPEIDS);
+        if (sids == null) {
+            sids = (List)e.get(CameoConstants.OLDAPPLIEDSTEREOTYPEIDS);
+        }
         if (sids != null && !sids.isEmpty()) {
             Set<String> ids = new HashSet<>(sids);
             ids.retainAll(CameoConstants.VIEWSIDS);
@@ -59,6 +62,9 @@ public boolean isView(ElementJson e) {
 
     public boolean isDocument(ElementJson e) {
         List<String> sids = (List)e.get(CameoConstants.APPLIEDSTEREOTYPEIDS);
+        if (sids == null) {
+            sids = (List)e.get(CameoConstants.OLDAPPLIEDSTEREOTYPEIDS);
+        }
         if (sids != null && sids.contains(CameoConstants.DOCUMENTSID)) {
             return true;
         }
@@ -88,7 +94,6 @@ public ElementJson createProperty(String id, String name, String ownerId, String
         res.put(CameoConstants.DOCUMENTATION, "");
         res.put(CameoConstants.MDEXTENSIONSIDS, new ArrayList());
         res.put(CameoConstants.SYNCELEMENTID, null);
-        res.put(CameoConstants.APPLIEDSTEREOTYPEINSTANCEID, null);
         res.put(CameoConstants.CLIENTDEPENDENCYIDS, new ArrayList());
         res.put(CameoConstants.SUPPLIERDEPENDENCYIDS, new ArrayList());
         res.put(CameoConstants.VISIBILITY, "private");
@@ -135,7 +140,6 @@ public ElementJson createAssociation(String id, String ownerId, String ownedEnd,
         association.put(CameoConstants.MDEXTENSIONSIDS, new ArrayList());
         association.put(CameoConstants.SYNCELEMENTID, null);
         association.put(CameoConstants.APPLIEDSTEREOTYPEIDS, new ArrayList());
-        association.put(CameoConstants.APPLIEDSTEREOTYPEINSTANCEID, null);
         association.put(CameoConstants.CLIENTDEPENDENCYIDS, new ArrayList());
         association.put(CameoConstants.SUPPLIERDEPENDENCYIDS, new ArrayList());
         association.put(CameoConstants.NAMEEXPRESSION, null);

crud/src/main/java/org/openmbee/mms/crud/services/DefaultBranchService.java

@@ -114,7 +114,12 @@ public RefsResponse getBranch(String projectId, String id) {
     public RefJson createBranch(String projectId, RefJson branch) {
         Instant now = Instant.now();
         ContextHolder.setContext(projectId);
-        Branch b = new Branch();
+
+        Optional<Branch> branchesOption = this.branchRepository.findByBranchId(branch.getId());
+        Branch b = branchesOption.orElseGet(Branch::new);
+        if (b.isDeleted()) {
+            throw new BadRequestException("Bad Request Error: Branch was previously deleted.");
+        }
 
         b.setBranchId(branch.getId());
         b.setBranchName(branch.getName());

gradle.properties

@@ -1,4 +1,4 @@
-version=4.0.17
+version=4.0.18
 group=org.openmbee.mms
 
 springBootVersion=2.6.7