Skip to content

Commit

Permalink
Merge branch 'release/2022-07'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-gomes committed Aug 9, 2022
2 parents 2ae3545 + 67d2ce9 commit a18de6b
Show file tree
Hide file tree
Showing 9 changed files with 606 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/org/omg/sysml/lifecycle/impl/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
@MetaValue(value = "PortUsage", targetEntity = PortUsageImpl.class),
@MetaValue(value = "PortioningFeature", targetEntity = PortioningFeatureImpl.class),
@MetaValue(value = "Predicate", targetEntity = PredicateImpl.class),
@MetaValue(value = "PrefixComment", targetEntity = PrefixCommentImpl.class),
@MetaValue(value = "Redefinition", targetEntity = RedefinitionImpl.class),
@MetaValue(value = "ReferenceUsage", targetEntity = ReferenceUsageImpl.class),
@MetaValue(value = "Relationship", targetEntity = RelationshipImpl.class),
Expand Down
31 changes: 31 additions & 0 deletions app/org/omg/sysml/metamodel/PrefixComment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* SysML v2 REST/HTTP Pilot Implementation
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
*/

package org.omg.sysml.metamodel;

import java.util.Collection;
import java.util.List;
import java.util.Set;

public interface PrefixComment extends Comment, SysMLType {

}
2 changes: 2 additions & 0 deletions app/org/omg/sysml/metamodel/impl/FeatureValueImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,13 @@ public void setElementId(java.util.UUID elementId) {



// @info.archinnov.achilles.annotations.Transient
// @info.archinnov.achilles.annotations.Column("featureWithValue")
private Feature featureWithValue;

@JsonGetter
@JsonSerialize(using = DataSerializer.class)
// @javax.persistence.Transient
@Any(metaDef = "FeatureMetaDef", metaColumn = @javax.persistence.Column(name = "featureWithValue_type"), fetch = FetchType.LAZY)
@JoinColumn(name = "featureWithValue_id", table = "FeatureValue")
public Feature getFeatureWithValue() {
Expand Down
Loading

0 comments on commit a18de6b

Please sign in to comment.